OS X app bundle should contain static linked executable; 'bool' is part of the C++ standard

svn-id: r5795

3 files changed, 12 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index b872966075..97aaebc96d 100644
--- a/Makefile
+++ b/Makefile
@@ -75,10 +75,17 @@ deb:
 
 # 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
diff --git a/common/scummsys.h b/common/scummsys.h
index 064e9212d1..8b0e7fea29 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -26,11 +26,6 @@
 // TODO - use config.h, generated by configure
 //#include "config.h"
 
-#if defined(HAVE_NO_BOOL)
-typedef int bool;
-const bool true(1), false(0);
-#endif  /*  HAVE_NO_BOOL  */
-
 #if defined(USE_MAD) || defined(USE_VORBIS)
 #define COMPRESSED_SOUND_FILE
 #endif
diff --git a/configure b/configure
index b61a4c6e23..d2f0288eed 100755
--- a/configure
+++ b/configure
@@ -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
 # * ....