[Scummvm-cvs-logs] SF.net SVN: scummvm: [20627] residual/trunk/Makefile.common

marcus_c at users.sourceforge.net marcus_c at users.sourceforge.net
Sun Feb 12 08:24:03 CET 2006


Revision: 20627
Author:   marcus_c
Date:     2006-02-12 08:23:07 -0800 (Sun, 12 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20627&view=rev

Log Message:
-----------
Made it possible to override driver objects, and to build in a separate directory.

Modified Paths:
--------------
    residual/trunk/Makefile.common
Modified: residual/trunk/Makefile.common
===================================================================
--- residual/trunk/Makefile.common	2006-02-12 15:46:14 UTC (rev 20626)
+++ residual/trunk/Makefile.common	2006-02-12 16:23:07 UTC (rev 20627)
@@ -33,37 +33,12 @@
 	imuse/imuse_sndmgr.o \
 	imuse/imuse_tables.o \
 	imuse/imuse_track.o \
-	tinygl/api.o \
-	tinygl/arrays.o \
-	tinygl/clear.o \
-	tinygl/clip.o \
-	tinygl/error.o \
-	tinygl/get.o \
-	tinygl/image_util.o \
-	tinygl/init.o \
-	tinygl/light.o \
-	tinygl/list.o \
-	tinygl/matrix.o \
-	tinygl/memory.o \
-	tinygl/misc.o \
-	tinygl/msghandling.o \
-	tinygl/select.o \
-	tinygl/specbuf.o \
-	tinygl/texture.o \
-	tinygl/vertex.o \
-	tinygl/zbuffer.o \
-	tinygl/zdither.o \
-	tinygl/zline.o \
-	tinygl/zmath.o \
-	tinygl/ztriangle.o \
 	actor.o \
 	bitmap.o \
 	blocky16.o \
 	costume.o \
 	debug.o \
-	driver_sdl.o \
-	driver_gl.o \
-	driver_tinygl.o \
+	$(DRIVER_OBJS) \
 	engine.o \
 	savegame.o \
 	font.o \
@@ -89,12 +64,44 @@
 	vima.o \
 	walkplane.o
 
+DRIVER_OBJS ?=\
+	driver_sdl.o \
+	driver_gl.o \
+	driver_tinygl.o \
+	$(TINYGL_OBJS)
+
+TINYGL_OBJS =\
+	tinygl/api.o \
+	tinygl/arrays.o \
+	tinygl/clear.o \
+	tinygl/clip.o \
+	tinygl/error.o \
+	tinygl/get.o \
+	tinygl/image_util.o \
+	tinygl/init.o \
+	tinygl/light.o \
+	tinygl/list.o \
+	tinygl/matrix.o \
+	tinygl/memory.o \
+	tinygl/misc.o \
+	tinygl/msghandling.o \
+	tinygl/select.o \
+	tinygl/specbuf.o \
+	tinygl/texture.o \
+	tinygl/vertex.o \
+	tinygl/zbuffer.o \
+	tinygl/zdither.o \
+	tinygl/zline.o \
+	tinygl/zmath.o \
+	tinygl/ztriangle.o
+
 DEPS = $(OBJS:.o=.d)
 
 residual: $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .cpp.o:
+	@test -d $(*D) || mkdir -p $(*D)
 	$(CXX) $(CXXFLAGS) -Wp,-MMD,"$*.d",-MQ,"$*.o",-MP -c $(<) -o $*.o
 
 clean: 







More information about the Scummvm-git-logs mailing list