Apply patch from Yura Siamashka to fix cross-compiling (thanks).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2268 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -3,6 +3,8 @@
  * plugins/*, src/*, tagmanager/*:
    Apply patch from Daniel Richard G. to fix to fix several
    compiler warnings, C89 violations and minor code problems (thanks).
+ * configure.in, scintilla/ScintillaGTK.cxx, src/Makefile.am:
+   Apply patch from Yura Siamashka to fix cross-compiling (thanks).
 
 
 2008-02-18  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

configure.in

@@ -117,28 +117,6 @@ AC_SUBST(GTK_LIBS)
 AC_ARG_ENABLE(deprecated, [  --disable-deprecated    Disable deprecated GTK functions. ],
 			  [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
 
-# socket support
-AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
- [want_socket="$enableval"], [want_socket="yes"])
-
-if test "x$want_socket" = "xyes"; then
-	AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
-	# this should bring in libsocket on Solaris:
-	AC_SEARCH_LIBS([connect],[socket],[],[],[])
-fi
-
-# VTE support
-AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],
- [enable if you want virtual termninal support [[default=yes]]]),
- [want_vte="$enableval"], [want_vte="yes"])
-if test "x$want_vte" = "xyes"; then
-	AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
-fi
-AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH],
- [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
- ["$withval"], [Path to a loadable libvte])])
-
-
 # Plugins support
 AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support  [[default=no]]])], , enable_plugins=yes)
 
@@ -155,13 +133,45 @@ if test "x$build" = "x$host"; then
 	AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/random]))
 fi
 
-if test "x$host" = "xi386-mingw32msvc"; then
+case "${host}" in
+    *mingw*)
 	AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
 	want_vte="no"
+	want_socket="no"
 	AC_EXEEXT
+	AM_CONDITIONAL(MINGW, true)
+	;;
+    *)
+        AM_CONDITIONAL(MINGW, false)
+	;;
+esac
+
+dnl skip check if already decided
+if test "x$want_socket" = "x"; then
+    # socket support
+    AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
+     [want_socket="$enableval"], [want_socket="yes"])
+
+    if test "x$want_socket" = "xyes"; then
+    	AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
+	# this should bring in libsocket on Solaris:
+	AC_SEARCH_LIBS([connect],[socket],[],[],[])
+    fi
 fi
-AM_CONDITIONAL(MINGW, test "x$host" = "xi386-mingw32msvc")
 
+dnl skip check if already decided
+if test "x$want_vte" = "x"; then
+    # VTE support
+    AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],
+     [enable if you want virtual termninal support [[default=yes]]]),
+     [want_vte="$enableval"], [want_vte="yes"])
+    if test "x$want_vte" = "xyes"; then
+    	AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
+    fi
+    AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH],
+     [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
+     ["$withval"], [Path to a loadable libvte])])
+fi
 
 GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
 

scintilla/ScintillaGTK.cxx

@@ -15,7 +15,7 @@
 #include "Platform.h"
 
 #if PLAT_GTK_WIN32
-#include "Windows.h"
+#include "windows.h"
 #endif
 
 #include "Scintilla.h"

src/Makefile.am

@@ -49,19 +49,22 @@ noinst_HEADERS = \
 
 if MINGW
 # build Geany for Windows on non-Windows systems (cross-compile)
-WINDRES = /usr/local/cross-tools/bin/i386-mingw32msvc-windres
+WINDRES = $(host)-windres
 
 geany_SOURCES = $(SRCS) win32.c win32.h
 geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @GTK_LIBS@ \
 			$(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \
 			geany_private.res
-AM_CFLAGS = -mms-bitfields
-geany_LDFLAGS =	-mwindows
+AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
+			-DGEANY_LOCALEDIR=\"data\" \
+			-DGEANY_LIBDIR=\"\" \
+			-DGEANY_PREFIX=\"\" \
+geany_LDFLAGS =	-mwindows -mms-bitfields
 
 INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \
            -I/usr/local/cross-tools/include @GTK_CFLAGS@
 
-geany_windres.res:
+geany_private.res:
 	$(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff;
 
 clean-local: