Revision: 3467 http://geany.svn.sourceforge.net/geany/?rev=3467&view=rev Author: eht16 Date: 2009-01-14 18:38:31 +0000 (Wed, 14 Jan 2009)
Log Message: ----------- Fix Windows build: don't use GIO. Link against GIO anyways just to be safe with GTK 2.14.
Modified Paths: -------------- trunk/ChangeLog trunk/src/makefile.win32 trunk/win32-config.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-14 16:45:24 UTC (rev 3466) +++ trunk/ChangeLog 2009-01-14 18:38:31 UTC (rev 3467) @@ -14,6 +14,9 @@ * src/msgwindow.c: Strip the compiler error messages to fix possibly broken message parsing. + * win32-config.h, src/makefile.win32: + Fix Windows build: don't use GIO. + Link against GIO anyways just to be safe with GTK 2.14.
2009-01-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2009-01-14 16:45:24 UTC (rev 3466) +++ trunk/src/makefile.win32 2009-01-14 18:38:31 UTC (rev 3467) @@ -46,7 +46,7 @@ ifdef GTK280 ALL_GTK_LIBS +=-liconv else -ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 +ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 -lgio-2.0 endif
WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \
Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2009-01-14 16:45:24 UTC (rev 3466) +++ trunk/win32-config.h 2009-01-14 18:38:31 UTC (rev 3467) @@ -321,6 +321,6 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1
-/* Define if GIO should be used, need GLib 2.16.x or newer */ -#define HAVE_GIO 1 +/* Define if GIO should be used, we don't use GIO on Windows */ +/* #define HAVE_GIO 1 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.