Revision: 2271 http://geany.svn.sourceforge.net/geany/?rev=2271&view=rev Author: eht16 Date: 2008-02-22 01:56:31 -0800 (Fri, 22 Feb 2008)
Log Message: ----------- Fix more cross-compiling issues including little cleanup.
Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Makefile.am trunk/src/Makefile.am
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-21 22:06:37 UTC (rev 2270) +++ trunk/ChangeLog 2008-02-22 09:56:31 UTC (rev 2271) @@ -1,3 +1,9 @@ +2008-02-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/Makefile.am, src/Makefile.am: + Fix more cross-compiling issues including little cleanup. + + 2008-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* doc/geany.html, doc/geany.txt, src/editor.c, src/editor.h,
Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2008-02-21 22:06:37 UTC (rev 2270) +++ trunk/scintilla/Makefile.am 2008-02-22 09:56:31 UTC (rev 2271) @@ -89,11 +89,7 @@
libscintilla_a_SOURCES = $(SRCS)
-if MINGW -INCLUDES=-I$(top_srcdir) -I$(srcdir)/include -I/usr/local/cross-tools/include @GTK_CFLAGS@ -else INCLUDES=-I$(top_srcdir) -I$(srcdir)/include @GTK_CFLAGS@ -endif
marshallers: scintilla-marshal.list glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-02-21 22:06:37 UTC (rev 2270) +++ trunk/src/Makefile.am 2008-02-22 09:56:31 UTC (rev 2271) @@ -47,22 +47,28 @@ support.h \ plugindata.h
+INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -I/tmp @GTK_CFLAGS@ + +# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla +nodist_EXTRA_geany_SOURCES = dummy.cxx + if MINGW # build Geany for Windows on non-Windows systems (cross-compile) -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 + +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) \ + -lkernel32 -limm32 -lshfolder -lshell32 -lole32 -luuid -lcomdlg32 \ + -lcomctl32 -liberty -lwsock32 geany_private.res + AM_CFLAGS = -DGEANY_DATADIR="data" \ -DGEANY_LOCALEDIR="data" \ -DGEANY_LIBDIR="" \ - -DGEANY_PREFIX="" \ + -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@ +WINDRES = $(host_alias)-windres
geany_private.res: $(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff; @@ -75,16 +81,14 @@
geany_SOURCES = $(SRCS) vte.c vte.h
-# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla -nodist_EXTRA_geany_SOURCES = dummy.cxx geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS)
-INCLUDES = \ - -DGEANY_DATADIR=""$(datadir)"" -DGEANY_LIBDIR=""$(libdir)"" \ - -DGEANY_LOCALEDIR=""$(localedir)"" -DGEANY_PREFIX=""$(prefix)"" \ - -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@ +AM_CFLAGS = -DGEANY_DATADIR=""$(datadir)"" \ + -DGEANY_LIBDIR=""$(libdir)"" \ + -DGEANY_LOCALEDIR=""$(localedir)"" \ + -DGEANY_PREFIX=""$(prefix)""
clean-local:
+endif
-endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.