[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.60,1.61

Max Horn fingolfin at users.sourceforge.net
Mon Sep 8 22:38:25 CEST 2003


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv23372

Modified Files:
	Makefile.common 
Log Message:
changes to get a better link order, and to allow building a 'bare bone' scummvm executable

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile.common	8 Sep 2003 15:33:26 -0000	1.60
+++ Makefile.common	8 Sep 2003 17:42:53 -0000	1.61
@@ -71,10 +71,10 @@
 
 # After the game specific modules follow the shared modules
 MODULES += \
-	common \
 	gui \
 	backends \
 	sound \
+	common \
 	backends/fs/posix \
 	backends/fs/morphos \
 	backends/fs/windows \
@@ -98,7 +98,7 @@
 common/engine.o: $(OBJS)
 
 # HACK temporary fix to get compilation on OS X (and possibly others) working again
-OBJS:=common/engine.o $(OBJS)
+OBJS:=common/main.o common/gameDetector.o $(OBJS)
 
 scummvm$(EXEEXT):  $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)





More information about the Scummvm-git-logs mailing list