[Scummvm-cvs-logs] CVS: scummvm-new Makefile,1.2,1.3 Makefile.common,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm-new
In directory usw-pr-cvs1:/tmp/cvs-serv25896

Modified Files:
	Makefile Makefile.common 
Log Message:
first go at modularizing the build system

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	21 Aug 2002 16:53:11 -0000	1.2
+++ Makefile	21 Aug 2002 17:35:45 -0000	1.3
@@ -6,6 +6,10 @@
 LDFLAGS :=
 INCLUDES:= -I. -Icommon -Iscumm
 LIBS	 = -lncurses
+OBJS	 =
+
+# Load the build rules & settings for the chosen backend
+-include build.rules
 
 # Enable this if you want ScummVM to dump all scripts it runs.
 # This is mainly interesting for developers.
@@ -19,32 +23,7 @@
 # DEFINES += -DUSE_ALSA
 # LIBS    += -lasound
 
-# Now, please choose a graphical output system between SDL, SDL/GL and X11.
-# Beware, only define one of them, otherwise the compilation will blow up.
-
-# Comment this if you want to disable SDL output
-OBJS	 = backends/sdl/sdl.o
-INCLUDES += `sdl-config --cflags`
-LIBS    += `sdl-config --libs`
-DEFINES += -DUNIX
-
-# Uncomment this (instead of the above) to activate the SDL with OpenGL output
-# OBJS	 = backends/sdl/sdl_gl.o
-# INCLUDES += `sdl-config --cflags`
-# LIBS    += `sdl-config --libs` -lGL
-# DEFINES += -DUNIX
-
-# Uncomment this in addition to the above if you compile on Mac OS X
-LIBS	+= -framework QuickTime -framework AudioUnit
-DEFINES += -DMACOSX
-
-# Uncomment this if you rather want X11 output
-# OBJS     = backends/x11/x11.o
-# DEFINES += -DUNIX -DX11_BACKEND
-# LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
-# INCLUDES+= -I/usr/X11R6/include
-# LIBS    += -lpthread -lXext -lX11
-
+# Concat DEFINES and INCLUDES to for the CPPFLAGS
 CPPFLAGS= $(DEFINES) $(INCLUDES)
 
 include Makefile.common
@@ -52,3 +31,7 @@
 dist:
 	rm -f $(ZIPFILE)
 	zip -q $(ZIPFILE) $(DISTFILES)
+
+# Until we add a nice configure tool, default to the SDL build rules
+build.rules:
+	ln -s backends/sdl/build.rules

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/Makefile.common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.common	21 Aug 2002 16:53:11 -0000	1.5
+++ Makefile.common	21 Aug 2002 17:35:45 -0000	1.6
@@ -3,7 +3,7 @@
 # common rules, a list of common object files etc.
 
 # List of all sub modules
-MODULES := common gui scumm simon sound
+MODULES += common gui scumm simon sound
 
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip