Revision: 1962 http://geany.svn.sourceforge.net/geany/?rev=1962&view=rev Author: eht16 Date: 2007-10-19 09:55:04 -0700 (Fri, 19 Oct 2007)

Log Message: ----------- Forgot to commit, sorry.

Modified Paths: -------------- trunk/src/Makefile.am

Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-10-19 14:48:19 UTC (rev 1961) +++ trunk/src/Makefile.am 2007-10-19 16:55:04 UTC (rev 1962) @@ -45,14 +45,14 @@ plugindata.h

if MINGW -# build Geany for Windows +# build Geany for Windows on non-Windows systems (cross-compile) WINDRES = /usr/local/cross-tools/bin/i386-mingw32msvc-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 -AM_CFLAGS = -Wall -pipe -mms-bitfields +AM_CFLAGS = -mms-bitfields geany_LDFLAGS = -mwindows

INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \ @@ -66,19 +66,12 @@

else # build Geany for all other platforms -if IS_COMPILER_GCC - AM_CFLAGS = -Wall -pipe -else - AM_CFLAGS = -endif

geany_SOURCES = $(SRCS) vte.c vte.h

-if IS_COMPILER_GCC - geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lstdc++ $(INTLLIBS) -else - geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ -lCrun $(INTLLIBS) -endif +# 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 = \ -DPACKAGE_DATA_DIR=""$(datadir)"" -DPACKAGE_LIB_DIR=""$(libdir)"" \

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