[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.45,1.46
Max Horn
fingolfin at users.sourceforge.net
Fri Mar 7 11:10:07 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm sky.dsp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.44,2.45 resource_v2.cpp,1.10,1.11 resource_v3.cpp,1.7,1.8 script_v6.cpp,1.71,1.72 scumm.h,1.156,1.157 sound.cpp,1.94,1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv12619
Modified Files:
Makefile.common
Log Message:
small tweak to the hack to fix the static/bundle targets on OS X
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile.common 7 Mar 2003 17:05:22 -0000 1.45
+++ Makefile.common 7 Mar 2003 18:41:27 -0000 1.46
@@ -39,8 +39,10 @@
# Include the build instructions for all modules
-include $(patsubst %,%/module.mk,$(MODULES))
+# HACK temporary fix to get compilation on OS X (and possibly others) working again
+OBJS:=common/engine.o $(OBJS)
-scummvm$(EXEEXT): common/engine.o $(OBJS)
+scummvm$(EXEEXT): $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
clean:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm sky.dsp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.44,2.45 resource_v2.cpp,1.10,1.11 resource_v3.cpp,1.7,1.8 script_v6.cpp,1.71,1.72 scumm.h,1.156,1.157 sound.cpp,1.94,1.95
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list