[Scummvm-cvs-logs] CVS: scummvm Makefile,1.23,1.24 configure,1.7,1.8

[Max Horn]

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

Modified Files:
	Makefile configure 
Log Message:
OS X app bundle should contain static linked executable; 'bool' is part of the C++ standard

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	20 Nov 2002 18:05:01 -0000	1.23
+++ Makefile	1 Dec 2002 20:29:19 -0000	1.24
@@ -75,10 +75,17 @@
 
 # Special target to create a application wrapper for Mac OS X
 bundle_name = ScummVM.app
-bundle: scummvm
+bundle: scummvm-static
 	mkdir -p $(bundle_name)/Contents/MacOS
 	mkdir -p $(bundle_name)/Contents/Resources
 	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
 	cp Info.plist $(bundle_name)/Contents/
 	cp scummvm.icns $(bundle_name)/Contents/Resources/
-	cp $< $(bundle_name)/Contents/MacOS/
+	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
+	strip $(bundle_name)/Contents/MacOS/scummvm
+
+# Special target to create a static linked binary for Mac OS X
+scummvm-static: $(OBJS)
+	$(CXX) $(LDFLAGS) -o scummvm-static $(OBJS) /sw/lib/libSDLmain.a /sw/lib/libSDL.a /sw/lib/libmad.a -framework OpenGL -framework AGL -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -framework AudioUnit
+
+.PHONY: deb bundle

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure	27 Oct 2002 05:56:36 -0000	1.7
+++ configure	1 Dec 2002 20:29:19 -0000	1.8
@@ -14,12 +14,9 @@
 #   - select the desired backend (sdl, x11, ...)
 #   - whether to dump scripts (sets -DDUMP_SCRIPTS)
 #   - whether mad should be used (--enabled-mad) -> set LIBS/DEFINES
-# * detect whether the chose backend is available (e.g. call sdl-config)
-# * detect whether mad/ALSA/... are available
-# * detect endianess and write that into config.h
-# * detect size of data types and write that into config.h
-# * check whether compiler supports "bool" and if not, 
-#   define HAVE_NO_BOOL and add code to config.h to implement "bool"
+#   - whether to do a debug build (with -g) or an optimized build (-O3 etc.)
+# * detect whether the chosen backend is available (e.g. call sdl-config)
+# * detect whether mad/ALSA/vorbis/... are available
 # * ....