build: MinGW compilation fixes, rename libcaca.lib to caca.lib so that

g++ understands -lcaca directly; also add -DCACA_STATIC to the default flags.

build/lol-build

@@ -32,8 +32,8 @@ platform="$2"
 
 __init__()
 {
-    top_srcdir=$(dirname "$0")/..
-    cd $top_srcdir
+    top_srcdir="$(dirname "$0")/.."
+    cd "$top_srcdir"
     top_srcdir="`pwd`"
 
     case "${MSYSTEM}" in
@@ -46,7 +46,7 @@ __init__()
 
 bootstrap()
 {
-    cd $top_srcdir
+    cd "$top_srcdir"
     case "$platform" in
         ios-arm)
             # No bootstrapping needed
@@ -62,7 +62,7 @@ bootstrap()
 
 configure()
 {
-    cd $top_srcdir
+    cd "$top_srcdir"
     case "$platform" in
         windows-i386)
             if test "x${MSYSTEM}" = xMINGW32; then
@@ -152,7 +152,7 @@ configure()
             GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"
             GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
 
-            CPPFLAGS="$CPPFLAGS -L$PWD/contrib/libcaca-0.99.beta18/include"
+            CPPFLAGS="$CPPFLAGS -L$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC"
 
             PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
             ;;
@@ -164,7 +164,7 @@ configure()
 
 build()
 {
-    cd $top_srcdir
+    cd "$top_srcdir"
     case "$platform" in
         ios-arm)
             cd monsterz/ios
@@ -183,7 +183,7 @@ build()
 
 check()
 {
-    cd $top_srcdir
+    cd "$top_srcdir"
     case "$platform" in
         ios-arm)
             ;;
@@ -214,7 +214,7 @@ check()
 
 clean()
 {
-    cd $top_srcdir
+    cd "$top_srcdir"
     case "$platform" in
         ios-arm)
             cd monsterz/ios

configure.ac

@@ -114,13 +114,13 @@ AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
 
 
 dnl Are we on a Direct3D 9 platform?
-ac_cv_my_have_d3d9="no"
-AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"])
-if test "${ac_cv_my_have_d3d9}" != "no"; then
-  D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9 -lxinput"
-  AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9)
-fi
-AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no")
+#ac_cv_my_have_d3d9="no"
+#AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"])
+#if test "${ac_cv_my_have_d3d9}" != "no"; then
+#  D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9 -lxinput"
+#  AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9)
+#fi
+#AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no")
 
 
 LIBS_save="$LIBS"

win32/Lol.Core.Vars.props

@@ -31,7 +31,7 @@
     <CacaIncludes>$(CacaDir)\include</CacaIncludes>
     <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
     <CacaLibs Condition="'$(Platform)'=='x64'">$(CacaDir)\lib\x86_64-w64-mingw32</CacaLibs>
-    <CacaDeps>libcaca.lib</CacaDeps>
+    <CacaDeps>caca.lib</CacaDeps>
     <Win32Defines>CACA_STATIC;$(Win32Defines)</Win32Defines>
 
     <!-- GDI+ -->