contrib: add a precompiled Win32 version of CppUnit and update build system

accordingly.

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

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"
 

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

build/bitten.xml

@@ -12,7 +12,10 @@
           : ;
           ;;
         windows-i386)
-          PATH="$''PATH:./contrib/gtk-2.22.1/bin" M4PATH="./contrib/gtk-2.22.1/share/aclocal" ./bootstrap;
+          PATH="$''PATH:./contrib/gtk-2.22.1/bin";
+          M4PATH="$''M4PATH:./contrib/gtk-2.22.1/share/aclocal";
+          M4PATH="$''M4PATH:./contrib/cppunit-1.12.2/share/aclocal";
+          PATH="$''PATH" M4PATH="$''M4PATH" ./bootstrap;
           ;;
         *)
           ./bootstrap
@@ -30,6 +33,8 @@
           : ;
           ;;
         windows-i386)
+          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";
           CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-1.2.14/include";
           CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-image-1.2.10/include";
           CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-mixer-1.2.11/include";
@@ -43,6 +48,7 @@
           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";
+          CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/cppunit-1.12.2/include";
           LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-1.2.14/lib";
           LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-image-1.2.10/lib";
           LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-mixer-1.2.11/lib";
@@ -50,6 +56,7 @@
           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";
+          LDFLAGS="$''LDFLAGS -L$''PWD/contrib/cppunit-1.12.2/lib";
           CPPFLAGS="$''CPPFLAGS -mms-bitfields";
           LDFLAGS="$''LDFLAGS -static-libgcc -static-libstdc++";
           GTK_LIBS="$''GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32";
@@ -60,7 +67,7 @@
             HOSTFLAGS=--host=i586-mingw32msvc;
             BUILDFLAGS=--build=none;
           fi;
-          PKG_CONFIG_PATH="$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig" ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS="$''CPPFLAGS" LDFLAGS="$''LDFLAGS" GTK_LIBS="$''GTK_LIBS" LOL_LIBS="$''LOL_LIBS";
+          PKG_CONFIG_PATH="$''PKG_CONFIG_PATH" ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS="$''CPPFLAGS" LDFLAGS="$''LDFLAGS" GTK_LIBS="$''GTK_LIBS" LOL_LIBS="$''LOL_LIBS";
           ;;
         ps3-ppu)
           if test -f build-ps3; then ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none; fi;