r357 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-09-26 16:13:24 -0400 (Wed, 26 Sep 2007)
New Revision: 357

Modified:
   trunk/CMakeLists.txt
   trunk/mojosetup.c
Log:
Fixed missing bzlib symbol.


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-09-26 20:05:44 UTC (rev 356)
+++ trunk/CMakeLists.txt	2007-09-26 20:13:24 UTC (rev 357)
@@ -512,6 +512,7 @@
 
     # BINARY SIZE += 46
     IF(MOJOSETUP_INTERNAL_BZLIB)
+        ADD_DEFINITION(-DMOJOSETUP_INTERNAL_BZLIB=1)
         INCLUDE_DIRECTORIES(${BZLIB_DIR})
         SET(OPTIONAL_SRCS ${OPTIONAL_SRCS} ${BZLIB_SRCS})
     ELSE(MOJOSETUP_INTERNAL_BZLIB)

Modified: trunk/mojosetup.c
===================================================================
--- trunk/mojosetup.c	2007-09-26 20:05:44 UTC (rev 356)
+++ trunk/mojosetup.c	2007-09-26 20:13:24 UTC (rev 357)
@@ -555,6 +555,15 @@
 } // xstrdup
 
 
+// We have to supply this function under certain build types.
+#if MOJOSETUP_INTERNAL_BZLIB && BZ_NO_STDIO
+void bz_internal_error(int errcode)
+{
+    fatal(_("bzlib triggered an internal error: %d", errcode));
+} // bz_internal_error
+#endif
+
+
 // This is called from main()/WinMain()/whatever.
 int MojoSetup_main(int argc, char **argv)
 {