SF.net SVN: geany: [2144] trunk

[eht16 at users.sourceforge.net]

Revision: 2144
          http://geany.svn.sourceforge.net/geany/?rev=2144&view=rev
Author:   eht16
Date:     2008-01-02 11:27:36 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Add -lshfolder to linker flags on Windows. Add notice for Win9x users to install SHFolder.dll.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-02 16:23:32 UTC (rev 2143)
+++ trunk/ChangeLog	2008-01-02 19:27:36 UTC (rev 2144)
@@ -1,3 +1,10 @@
+2008-01-02  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * README, src/makefile.win32:
+   Add -lshfolder to linker flags on Windows.
+   Add notice for Win9x users to install SHFolder.dll.
+
+
 2008-01-02  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * tagmanager/c.c:
@@ -553,7 +560,7 @@
    for a new diff on the same file. Thanks.
 
 
-2007-11-04  Enrico Tröger  <enrico.troeger at uvena.de>
+2007-11-04  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/build.c:
    Fix error in Compile and Build commands on Windows if the command
@@ -593,7 +600,7 @@
    Remove filetype::style_func_ptr field.
 
 
-2007-11-02  Enrico Tröger  <enrico.troeger at uvena.de>
+2007-11-02  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/build.c, src/makefile.win32: Add exit code detection for Windows.
  * src/keyfile.c: Fix broken window maximization.
@@ -669,7 +676,7 @@
    Make sure current_dir always has a full path.
 
 
-2007-10-28  Enrico Tröger  <enrico.troeger at uvena.de>
+2007-10-28  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * doc/geany.txt, src/build.c, src/project.c, src/project.h:
    Add support for relative project base path.
@@ -1098,7 +1105,7 @@
    Correct prev_translators email address.
 
 
-2007-09-11  Enrico Tröger  <enrico.troeger at uvena.de>
+2007-09-11  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/callbacks.c: HTML manual is called Manual.html on Windows, so
                     open this file.
@@ -1181,7 +1188,7 @@
    argument contains relative path elements or symlinks.
 
 
-2007-09-03  Enrico Tröger  <enrico.troeger at uvena.de>
+2007-09-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/makefile.win32, src/ui_utils.c, src/win32.c,
    plugins/makefile.win32:

Modified: trunk/README
===================================================================
--- trunk/README	2008-01-02 16:23:32 UTC (rev 2143)
+++ trunk/README	2008-01-02 19:27:36 UTC (rev 2144)
@@ -69,8 +69,12 @@
 Geany runs also under Windows. To download the binary with all necessary
 files, visit Geany's homepage. But you should know, that the Windows
 version is not yet well tested and there are some features missing:
-- build support (perhaps will be added later, Run command is working)
+- build support (implemented but might be still buggy)
 - embedded terminal emulation (VTE)
+- Windows 9x users: in order to run Geany on Windows 95, 98 or ME you
+  need to install the file SHFolder.dll either in the Geany installation
+  directory or in your Windows directory. For more information please
+  visit http://support.microsoft.com/kb/241733.
 
 
 License
@@ -94,7 +98,7 @@
 
 
 --
-2005-2007 by Enrico Tröger, Nick Treleaven and Frank Lanitz
+2005-2008 by Enrico Tröger, Nick Treleaven and Frank Lanitz
 enrico.troeger(at)uvena(dot)de
 nick(dot)treleaven(at)btinternet(dot)com
 frank(at)frank(dot)uvena(dot)de

Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32	2008-01-02 16:23:32 UTC (rev 2143)
+++ trunk/src/makefile.win32	2008-01-02 19:27:36 UTC (rev 2144)
@@ -49,6 +49,9 @@
 PRINTING_LIBS=
 endif
 
+WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \
+		 -lole32 -luuid -lcomdlg32 -lcomctl32 -liberty -lwsock32
+
 CCFLAGS=-Wall -O2 -g -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
 
 OBJS =	about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o filetypes.o \
@@ -79,7 +82,7 @@
 $(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a
 	$(CXX) $(OBJS) $(RES) -o $(TARGET) \
 	../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) $(PRINTING_LIBS) \
-	 -mwindows -lkernel32 -limm32 -lshell32 -lole32 -luuid -lcomdlg32 -lcomctl32 -liberty -lwsock32
+	 $(WIN_LIBS)
 
 deps.mak:
 	$(CC) -MM  $(CCFLAGS) *.c >deps.mak


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