[Pingus-CVS] r2472 - in trunk: . src

[David Philippi at BerliOS]

Author: torangan
Date: 2005-11-01 13:37:10 +0100 (Tue, 01 Nov 2005)
New Revision: 2472

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/pingus.hxx
   trunk/src/tinygettext.cxx
Log:
patch to allow for compile on Linux/Windows

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2005-10-25 20:12:42 UTC (rev 2471)
+++ trunk/configure.ac  2005-11-01 12:37:10 UTC (rev 2472)
@@ -39,29 +39,43 @@
               [enable_debug="no"])
 AC_MSG_RESULT($enable_debug)
 if test "x$enable_debug" != "xno"; then
-   CXXFLAGS="-g -ggdb -O0 -Wall -Werror"
+   CXXFLAGS="-g -ggdb -O0 -Wall"
 fi
 
 dnl -- Static Libaries --
 AC_PROG_RANLIB
 
-REQUIRED_CLANLIB_VERSION="0.7.9"
+REQUIRED_CLANLIB_VERSION="0.8.0"
 
 PKG_CHECK_MODULES(PINGUS,
  [
-  clanCore-0.7           >= $REQUIRED_CLANLIB_VERSION
-  clanApp-0.7            >= $REQUIRED_CLANLIB_VERSION
-  clanDisplay-0.7        >= $REQUIRED_CLANLIB_VERSION
-  clanGL-0.7             >= $REQUIRED_CLANLIB_VERSION
-  clanSDL-0.7            >= $REQUIRED_CLANLIB_VERSION
-  clanGUI-0.7            >= $REQUIRED_CLANLIB_VERSION
-  clanGUIStyleSilver-0.7 >= $REQUIRED_CLANLIB_VERSION
-  clanSound-0.7          >= $REQUIRED_CLANLIB_VERSION
-  clanVorbis-0.7         >= $REQUIRED_CLANLIB_VERSION
-  clanMikMod-0.7         >= $REQUIRED_CLANLIB_VERSION
+  clanCore-0.8           >= $REQUIRED_CLANLIB_VERSION
+  clanApp-0.8            >= $REQUIRED_CLANLIB_VERSION
+  clanDisplay-0.8        >= $REQUIRED_CLANLIB_VERSION
+  clanGL-0.8             >= $REQUIRED_CLANLIB_VERSION
+  clanSDL-0.8            >= $REQUIRED_CLANLIB_VERSION
+  clanGUI-0.8            >= $REQUIRED_CLANLIB_VERSION
+  clanGUIStyleSilver-0.8 >= $REQUIRED_CLANLIB_VERSION
+  clanSound-0.8          >= $REQUIRED_CLANLIB_VERSION
+  clanVorbis-0.8         >= $REQUIRED_CLANLIB_VERSION
+  clanMikMod-0.8         >= $REQUIRED_CLANLIB_VERSION
   ],
  [])
 
+AC_DEFINE([HAVE_LIBCLANMIKMOD],1,[Has the clanMikMod library])
+AC_DEFINE([HAVE_LIBCLANVORBIS],1,[Has the clanVorbis library])
+
+dnl iconv() is defined differently on some platforms
+AM_ICONV
+if test "$am_cv_func_iconv" = yes; then
+  proto_iconv="$am_cv_proto_iconv_arg1"
+else
+  proto_iconv=""
+fi
+AC_SUBST([ICONV_LIBS], [$LIBICONV])
+AC_DEFINE([ICONV_CONST], $proto_iconv,
+  [Define as const if the declaration of iconv() needs const.])
+
 AC_SUBST(PINGUS_CFLAGS)
 AC_SUBST(PINGUS_LIBS)
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am       2005-10-25 20:12:42 UTC (rev 2471)
+++ trunk/src/Makefile.am       2005-11-01 12:37:10 UTC (rev 2472)
@@ -52,9 +52,6 @@
 pingus_CPPFLAGS = @PINGUS_CFLAGS@
 
 pingus_LDADD = \
-        @PINGUS_LIBS@ \
-        @LIBS@     \
-        \
         caimagemanipulation/libcaimagemanipulation.a \
         worldobjs/libpingus_worldobjs.a \
         actions/libpingus_actions.a      \
@@ -68,7 +65,10 @@
         input/axes/libpingus_input_axes.a \
         input/buttons/libpingus_input_buttons.a \
        input/pointers/libpingus_input_pointers.a \
-       input/scrollers/libpingus_input_scrollers.a
+       input/scrollers/libpingus_input_scrollers.a \
+        @PINGUS_LIBS@ \
+        @ICONV_LIBS@ \
+        @LIBS@
 
 pingus_level_test_CPPFLAGS = @PINGUS_CFLAGS@
 pingus_level_test_LDADD    = @PINGUS_LIBS@
@@ -287,7 +287,7 @@
 display/scene_context.cxx \
 display/scene_context.hxx
 
-STATICBIN_LIBS = -lclanGUI -lclanCore -lclanDisplay -lclanApp -lclanPNG 
-lclanJPEG -lHermes \
+STATICBIN_LIBS = -lclanGUI -lclanCore -lclanDisplay -lclanApp -lclanPNG 
-lclanJPEG \
 -lclanDisplay -lclanMikMod -lclanVorbis -logg -lvorbis -logg -lmikmod 
-lclanSound -lclanCore  \
 -L/usr/X11R6/lib/ \
 -lstdc++ \
@@ -307,7 +307,7 @@
 -lICE \
 -lXxf86vm \
 -lstdc++ \
--ldl
+-ldl 
 
 pingus.static: $(pingus_OBJECTS) $(pingus_DEPENDENCIES)
        $(CXX) $(CXXFLAGS) -s -static -o $@ $(pingus_OBJECTS) 
$(pingus_DEPENDENCIES) $(STATICBIN_LIBS) 

Modified: trunk/src/pingus.hxx
===================================================================
--- trunk/src/pingus.hxx        2005-10-25 20:12:42 UTC (rev 2471)
+++ trunk/src/pingus.hxx        2005-11-01 12:37:10 UTC (rev 2472)
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
 #ifndef HEADER_PINGUS_PINGUS_HXX
 #define HEADER_PINGUS_PINGUS_HXX
 

Modified: trunk/src/tinygettext.cxx
===================================================================
--- trunk/src/tinygettext.cxx   2005-10-25 20:12:42 UTC (rev 2471)
+++ trunk/src/tinygettext.cxx   2005-11-01 12:37:10 UTC (rev 2472)
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <ctype.h>
 #include <errno.h>
+#include <config.h>
 #include "tinygettext.hxx"
 #include "pingus_error.hxx"
 
@@ -86,7 +87,7 @@
                size_t in_size = text.size();
                size_t out_size = 4*in_size; // Worst case scenario: ASCII -> 
UTF-32?
                std::string result(out_size, ' ');
-               char* in_str = &text[0];
+               ICONV_CONST char* in_str = &text[0];
                char* out_str = &result[0];
  
                // Try to convert the text.