[Scummvm-cvs-logs] CVS: scummex Makefile,1.2,1.3

[Max Horn]

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

Modified Files:
	Makefile 
Log Message:
added a build rule for MacOS; some cleanup

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummex/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	19 Sep 2003 01:36:40 -0000	1.2
+++ Makefile	19 Sep 2003 15:42:00 -0000	1.3
@@ -1,16 +1,27 @@
-CC=g++
-RESSW=--define __WIN32__ --define __WIN95__ --define __GNUWIN32__
-OBJECTS=file.o scummex.o resource.o mixer.o image.o sound.o wxwindows.o descumm.o
-CFLAGS=-DOSUNIX -g -Wall -Wstrict-prototypes -Wuninitialized -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas `wx-config --cxxflags` `sdl-config --cflags`
-LIBS=`wx-config --libs` `sdl-config --libs` -lSDL_mixer
+CXX      := g++
+RESSW    := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
+REZ_CMD  := `wx-config --rezflags`
+OBJS     := file.o scummex.o resource.o mixer.o image.o sound.o wxwindows.o descumm.o
+CXXFLAGS := -DOSUNIX -g -O -Wall -Wuninitialized -Wshadow -Wstrict-prototypes -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+CXXFLAGS += `wx-config --cxxflags` `sdl-config --cflags`
+LIBS     := `wx-config --libs` `sdl-config --libs` -lSDL_mixer
 
 .SUFFIXES: .o .cpp
 
-all:    ${OBJECTS}
-	$(CC) -o scummex ${OBJECTS} ${LIBS}
+all: scummex
 
 .cpp.o: 
-	$(CC) ${CFLAGS} -c -o $@ $<
-	
+	$(CXX) ${CXXFLAGS} -c $< -o $@
+
+scummex: ${OBJS}
+	$(CXX) $+ ${LIBS} -o $@
+
+# Special build rule for MacOS: need to add the resource fork to the binary. 
+# Not sure if we can just use REZ_CMD unconditionally on all platforms?
+mac: scummex
+	$(REZ_CMD) scummex
+
 clean:
 	rm -f scummex file.o scummex.o resource.o mixer.o image.o sound.o wxwindows.o descumm.o
+
+.PHONY: all clean mac