[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.81,1.82

Max Horn fingolfin at users.sourceforge.net
Wed Feb 25 02:25:03 CET 2004


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13050

Modified Files:
	Makefile.common 
Log Message:
alternate linking order, avoids 'SDL_main' related linker errors on OSX (this shouldn't break other linkers, I hope - if it does, please tell me, and feel free to undo this)

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Makefile.common	15 Feb 2004 01:21:02 -0000	1.81
+++ Makefile.common	25 Feb 2004 10:09:18 -0000	1.82
@@ -109,7 +109,7 @@
 
 # The build rule for the ScummVM executable
 $(EXECUTABLE):  $(OBJS)
-	$(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $(LIBS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) -o $@
 
 distclean: clean
 	$(RM_REC) $(DEPDIRS)





More information about the Scummvm-git-logs mailing list