first go at modularizing the build system

svn-id: r4796

Makefile

@@ -6,6 +6,10 @@ DEFINES  =
 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 @@ LIBS    += -lmad
 # 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 @@ include Makefile.common
 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

Makefile.common

@@ -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
 

backends/morphos/build.rules

@@ -0,0 +1,5 @@
+CC      = g++
+CFLAGS  = -Wno-multichar -fstrength-reduce -fno-rtti -O2
+DEFINES = -DNO_PPCINLINE_STDARG -DNO_PPCINLINE_VARARGS
+LDFLAGS = -noixemul -s
+LIBS	= -lamiga -lamigastubs -lcdda

backends/sdl/build.rules

@@ -0,0 +1,16 @@
+# Build settings for the SDL backend
+MODULES  += backends/sdl
+OBJS	 += backends/sdl/sdl.o
+DEFINES  += -DUNIX
+INCLUDES += `sdl-config --cflags`
+LIBS     += `sdl-config --libs`
+
+# Uncomment this (instead of the above) to activate the SDL with OpenGL output
+# OBJS	   += backends/sdl/sdl_gl.o
+# DEFINES  += -DUNIX
+# INCLUDES += `sdl-config --cflags`
+# LIBS     += `sdl-config --libs` -lGL
+
+# Uncomment this in addition to the above if you compile on Mac OS X
+DEFINES += -DMACOSX
+LIBS	+= -framework QuickTime -framework AudioUnit

backends/x11/build.rules

@@ -0,0 +1,7 @@
+# Build settings for the X11 backend
+MODULES  += backends/x11
+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

scumm/scumm.h

@@ -29,7 +29,7 @@
 #include "sound.h"
 
 #define SCUMMVM_VERSION "0.2.2 CVS"
-#define SCUMMVM_CVS "2002-08-03"
+#define SCUMMVM_CVS "2002-08-21"
 
 #define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
 #define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))