diff --git a/Makefile.am b/Makefile.am index baaba230..21f6c502 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = \ geany.desktop.in \ geany.spec \ geany.glade \ - geany_windres.rc \ + geany_private.rc \ geany.gladep \ data/global.tags \ data/php.tags \ @@ -51,19 +51,6 @@ dist-hook: done \ fi -if MINGW -install-win32: - GEANY_INSTALL_DIR=geany; \ - mkdir $(GEANY_INSTALL_DIR); \ - cp ChangeLog $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ - cp TODO $(GEANY_INSTALL_DIR)/ToDo.txt; \ - cp COPYING $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ - cp AUTHORS $(GEANY_INSTALL_DIR)/Authors.txt; \ - cp README $(GEANY_INSTALL_DIR)/ReadMe.txt; \ - cp THANKS $(GEANY_INSTALL_DIR)/Thanks.txt; \ - @# to be finished -endif - BZIP2_ENV =--best dist-bzip2: distdir diff --git a/configure.in b/configure.in index 96fd9f2d..473b39f3 100644 --- a/configure.in +++ b/configure.in @@ -169,7 +169,6 @@ doc/Makefile doc/geany.1 geany.spec geany.desktop -geany_windres.rc ]) echo "----------------------------------------" diff --git a/geany_windres.rc.in b/geany_windres.rc.in deleted file mode 100644 index 95042a32..00000000 --- a/geany_windres.rc.in +++ /dev/null @@ -1,32 +0,0 @@ - -#include // include for version info constants - - -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" - -1 VERSIONINFO -FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 -PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 -FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" - { - BLOCK "040704E4" - { - VALUE "CompanyName", "" - VALUE "FileVersion", "@VERSION_STRING@" - VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" - VALUE "InternalName", "geany" - VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "geany" - VALUE "ProductName", "geany" - VALUE "ProductVersion", "@VERSION_STRING@" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0407, 1252 - } -} - diff --git a/src/Makefile.am b/src/Makefile.am index bdb8196b..17368ca0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ 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++ @PACKAGE_LIBS@ \ $(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \ - geany_windres.res + geany_private.res AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0 geany_LDFLAGS = -mwindows @@ -48,10 +48,10 @@ INCLUDES = -I../scintilla/include -I../tagmanager/include -DENABLE_NLS \ -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@ geany_windres.res: - $(WINDRES) -i ../geany_windres.rc --input-format=rc -o geany_windres.res -O coff; + $(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff; clean-local: - rm -f geany_windres.res + rm -f geany_private.res else # build Geany for all other platforms