Revision: 4924 http://geany.svn.sourceforge.net/geany/?rev=4924&view=rev Author: eht16 Date: 2010-05-16 17:44:40 +0000 (Sun, 16 May 2010)
Log Message: ----------- Add new GTK define also for Mingw cross compilation and makefile.win32 based Windows builds (untested).
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/plugins/makefile.win32 trunk/src/Makefile.am trunk/src/makefile.win32
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-16 17:44:24 UTC (rev 4923) +++ trunk/ChangeLog 2010-05-16 17:44:40 UTC (rev 4924) @@ -14,6 +14,10 @@ * geany.pc.in, wscript, plugins/Makefile.am, src/Makefile.am, src/plugindata.h, scintilla/*, scintilla/include/*: Update Scintilla to version 2.11. + * plugins/Makefile.am, plugins/makefile.win32, src/Makefile.am, + src/makefile.win32: + Add new GTK define also for Mingw cross compilation and + makefile.win32 based Windows builds.
2010-05-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2010-05-16 17:44:24 UTC (rev 4923) +++ trunk/plugins/Makefile.am 2010-05-16 17:44:40 UTC (rev 4924) @@ -35,6 +35,7 @@ MINGW_CFLAGS = \ -DGEANY_DATADIR="data" \ -DHAVE_CONFIG_H \ + -DGTK \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tagmanager/include \
Modified: trunk/plugins/makefile.win32 =================================================================== --- trunk/plugins/makefile.win32 2010-05-16 17:44:24 UTC (rev 4923) +++ trunk/plugins/makefile.win32 2010-05-16 17:44:40 UTC (rev 4924) @@ -36,6 +36,7 @@ else CFLAGS=-O2 $(CBASEFLAGS) endif +CFLAGS += -DGTK
ifndef GTK210 ALL_GTK_LIBS += -liconv
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2010-05-16 17:44:24 UTC (rev 4923) +++ trunk/src/Makefile.am 2010-05-16 17:44:40 UTC (rev 4924) @@ -94,7 +94,8 @@ -DGEANY_LIBDIR="" \ -DGEANY_LOCALEDIR="" \ -DGEANY_PREFIX="" \ - -DGEANY_PRIVATE + -DGEANY_PRIVATE \ + -DGTK
geany_LDFLAGS = -mwindows -mms-bitfields
Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2010-05-16 17:44:24 UTC (rev 4923) +++ trunk/src/makefile.win32 2010-05-16 17:44:40 UTC (rev 4924) @@ -5,7 +5,8 @@ -DGEANY_DATADIR="data" \ -DGEANY_LOCALEDIR="" \ -DGEANY_LIBDIR="" \ - -DGEANY_PREFIX="" + -DGEANY_PREFIX="" \ + -DGTK
.SUFFIXES: .c .o .h .a WINDRES = windres.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.