From bf23a03ecdb2799a4eadad7fb08507d4ce85048b Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 29 Aug 2011 11:48:28 +0000
Subject: [PATCH] contrib: add a precompiled Win32 version of CppUnit and
 update build system accordingly.

---
 bootstrap        |  2 +-
 build-mingw      | 15 ++++++++++++++-
 build-ps3        |  3 +++
 build/bitten.xml | 11 +++++++++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 9bfd3fac..f3783a01 100755
--- a/bootstrap
+++ b/bootstrap
@@ -116,7 +116,7 @@ fi
 save_IFS=$IFS
 IFS=:
 tmp="$M4PATH"
-for x in "$tmp"; do
+for x in $tmp; do
   if test -n "$x"; then
     aclocalflags="${aclocalflags} -I $x"
   fi
diff --git a/build-mingw b/build-mingw
index 2dfe323f..879d24bb 100755
--- a/build-mingw
+++ b/build-mingw
@@ -2,12 +2,19 @@
 
 ##  Native MinGW compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>
 
+# This can't hurt
+make distclean
+
 set -e
 
 PATH="$PATH:./contrib/gtk-2.22.1/bin"
-M4PATH="./contrib/gtk-2.22.1/share/aclocal"
+
+M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
+M4PATH="$M4PATH:./contrib/cppunit-1.12.2/share/aclocal"
 export M4PATH # This looks necessary
+
 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig"
+PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/cppunit-1.12.2/lib/pkgconfig"
 export PKG_CONFIG_PATH # This looks necessary, too
 
 # SDL include path
@@ -29,6 +36,9 @@ CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"
 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/atk-1.0"
 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtkglarea-2.0.1/include"
 
+# CppUnit include path
+CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/cppunit-1.12.2/include"
+
 # SDL library path
 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-1.2.14/lib"
 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-image-1.2.10/lib"
@@ -42,6 +52,9 @@ LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/lib"
 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/bin"
 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtkglarea-2.0.1/lib"
 
+# CppUnit library path
+LDFLAGS="$LDFLAGS -L`pwd`/contrib/cppunit-1.12.2/lib"
+
 # Prevent issues with GTK+ internals
 CPPFLAGS="$CPPFLAGS -mms-bitfields"
 
diff --git a/build-ps3 b/build-ps3
index 3cb484ed..6acc15d7 100755
--- a/build-ps3
+++ b/build-ps3
@@ -2,6 +2,9 @@
 
 ##  Native PS3 compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>
 
+# This can't hurt
+make distclean
+
 set -e
 
 # Only on Windows
diff --git a/build/bitten.xml b/build/bitten.xml
index 9ee2fedb..a5d85064 100644
--- a/build/bitten.xml
+++ b/build/bitten.xml
@@ -12,7 +12,10 @@
           : ;
           ;;
         windows-i386)
-          PATH=&quot;$''PATH:./contrib/gtk-2.22.1/bin&quot; M4PATH=&quot;./contrib/gtk-2.22.1/share/aclocal&quot; ./bootstrap;
+          PATH=&quot;$''PATH:./contrib/gtk-2.22.1/bin&quot;;
+          M4PATH=&quot;$''M4PATH:./contrib/gtk-2.22.1/share/aclocal&quot;;
+          M4PATH=&quot;$''M4PATH:./contrib/cppunit-1.12.2/share/aclocal&quot;;
+          PATH=&quot;$''PATH&quot; M4PATH=&quot;$''M4PATH&quot; ./bootstrap;
           ;;
         *)
           ./bootstrap
@@ -30,6 +33,8 @@
           : ;
           ;;
         windows-i386)
+          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig&quot;;
+          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/cppunit-1.12.2/lib/pkgconfig&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/sdl-1.2.14/include&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/sdl-image-1.2.10/include&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/sdl-mixer-1.2.11/include&quot;;
@@ -43,6 +48,7 @@
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/atk-1.0&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/gtkglarea-2.0.1/include&quot;;
+          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/cppunit-1.12.2/include&quot;;
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/sdl-1.2.14/lib&quot;;
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/sdl-image-1.2.10/lib&quot;;
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/sdl-mixer-1.2.11/lib&quot;;
@@ -50,6 +56,7 @@
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/lib&quot;;
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/bin&quot;;
           LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/gtkglarea-2.0.1/lib&quot;;
+          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/cppunit-1.12.2/lib&quot;;
           CPPFLAGS=&quot;$''CPPFLAGS -mms-bitfields&quot;;
           LDFLAGS=&quot;$''LDFLAGS -static-libgcc -static-libstdc++&quot;;
           GTK_LIBS=&quot;$''GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32&quot;;
@@ -60,7 +67,7 @@
             HOSTFLAGS=--host=i586-mingw32msvc;
             BUILDFLAGS=--build=none;
           fi;
-          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig&quot; ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS=&quot;$''CPPFLAGS&quot; LDFLAGS=&quot;$''LDFLAGS&quot; GTK_LIBS=&quot;$''GTK_LIBS&quot; LOL_LIBS=&quot;$''LOL_LIBS&quot;;
+          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH&quot; ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS=&quot;$''CPPFLAGS&quot; LDFLAGS=&quot;$''LDFLAGS&quot; GTK_LIBS=&quot;$''GTK_LIBS&quot; LOL_LIBS=&quot;$''LOL_LIBS&quot;;
           ;;
         ps3-ppu)
           if test -f build-ps3; then ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none; fi;