SF.net SVN: geany:[2883] trunk

[eht16 at users.sourceforge.net]

Revision: 2883
          http://geany.svn.sourceforge.net/geany/?rev=2883&view=rev
Author:   eht16
Date:     2008-08-13 18:38:40 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Expect GTK 2.10 libs to link against by default and remove GTK210 flag. If anyone wants to build on Windows against GTK 2.6 or 2.8 use 'make GTK280=1'.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/makefile.win32

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-13 18:36:56 UTC (rev 2882)
+++ trunk/ChangeLog	2008-08-13 18:38:40 UTC (rev 2883)
@@ -2,6 +2,10 @@
 
  * doc/geany.txt, doc/geany.html:
    Add middle-click document closing to the Tips and Tricks appendix.
+ * src/makefile.win32:
+   Expect GTK 2.10 libs to link against by default and remove GTK210
+   flag. If anyone wants to build on Windows against GTK 2.6 or 2.8
+   use 'make GTK280=1'.
 
 
 2008-08-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32	2008-08-13 18:36:56 UTC (rev 2882)
+++ trunk/src/makefile.win32	2008-08-13 18:38:40 UTC (rev 2883)
@@ -43,10 +43,10 @@
 	#"$(PREFIX)/lib/asprintf.lib" \
 	#"$(PREFIX)/lib/charset.lib" \
 
-ifdef GTK210
+ifdef GTK280
+ALL_GTK_LIBS +=-liconv
+else
 ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0
-else
-ALL_GTK_LIBS +=-liconv
 endif
 
 WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.