SF.net SVN: geany:[3594] trunk - Commits

24 Feb 2009

Revision: 3594
          http://geany.svn.sourceforge.net/geany/?rev=3594&view=rev
Author:   eht16
Date:     2009-02-24 18:25:41 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
Enable socket support when cross-compiling.
Enable plugin compilation when cross-compiling.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in
    trunk/plugins/Makefile.am
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-02-20 01:08:50 UTC (rev 3593)
+++ trunk/ChangeLog	2009-02-24 18:25:41 UTC (rev 3594)
@@ -1,3 +1,10 @@
+2009-02-24  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * configure.in, plugins/Makefile.am:
+   Enable socket support when cross-compiling.
+   Enable plugin compilation when cross-compiling.
+
+
 2009-02-20  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
* src/editor.c: Set cursor for LaTeX at auto closing of environment
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-02-20 01:08:50 UTC (rev 3593)
+++ trunk/configure.in	2009-02-24 18:25:41 UTC (rev 3594)
@@ -173,7 +173,8 @@
    	])
    AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
    want_vte="no"
-	want_socket="no"
+	want_socket="yes"
+    	AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
    AC_EXEEXT
    AM_CONDITIONAL(MINGW, true)
    ;;
Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2009-02-20 01:08:50 UTC (rev 3593)
+++ trunk/plugins/Makefile.am	2009-02-24 18:25:41 UTC (rev 3594)
@@ -31,6 +31,41 @@
if PLUGINS
+if MINGW
+# build Geany for Windows on non-Windows systems (cross-compile)
+# (this is a little hack'ish and surely can be improved)
+DLL_LD_FLAGS = -module -avoid-version
+MINGW_CFLAGS = \
+			-DGEANY_DATADIR="data" \
+			-DHAVE_CONFIG_H \
+			-I$(top_srcdir) \
+			-I$(top_srcdir)/src \
+			-I$(top_srcdir)/tagmanager/include \
+			-I$(top_srcdir)/scintilla/include \
+			$(GTK_CFLAGS) \
+			$(PLUGIN_CFLAGS)
+
+.PHONY: all clean
+
+all-local: \
+	classbuilder.dll \
+	htmlchars.dll \
+	export.dll \
+	vcdiff.dll \
+	saveactions.dll \
+	filebrowser.dll
+# Split Window is broken on Windows
+#	splitwindow.dll
+
+.c.dll:
+	$(CC) $(MINGW_CFLAGS) -o $@.o -c $<
+	$(CC) -shared $@.o $(GTK_LIBS) $(DLL_LD_FLAGS) -o $@
+
+clean:
+	rm -f *.o *.dll
+
+else
+
 # Plugins to be installed
 plugin_LTLIBRARIES = \
    classbuilder.la \
@@ -64,6 +99,7 @@
 filebrowser_la_LIBADD   = $(GTK_LIBS)
 splitwindow_la_LIBADD   = $(GTK_LIBS)
+endif # MINGW
 endif # PLUGINS
AM_CPPFLAGS = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    