SF.net SVN: geany:[5639] trunk

colombanw at users.sourceforge.net colombanw at xxxxx
Sun Mar 27 16:02:21 UTC 2011


Revision: 5639
          http://geany.svn.sourceforge.net/geany/?rev=5639&view=rev
Author:   colombanw
Date:     2011-03-27 16:02:21 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
Revert r5638 "Enable SplitWindow build on Windows again."

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/Makefile.am
    trunk/plugins/makefile.win32
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-27 15:28:02 UTC (rev 5638)
+++ trunk/ChangeLog	2011-03-27 16:02:21 UTC (rev 5639)
@@ -4,8 +4,6 @@
    wscript:
    Initialize GLib's Gthread system early at startup in case any
    plugins need it.
- * plugins/Makefile.am, plugins/makefile.win32, wscript:
-   Enable SplitWindow build on Windows again.
 
 
 2011-03-27  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am	2011-03-27 15:28:02 UTC (rev 5638)
+++ trunk/plugins/Makefile.am	2011-03-27 16:02:21 UTC (rev 5639)
@@ -50,8 +50,9 @@
 	htmlchars.dll \
 	export.dll \
 	saveactions.dll \
-	splitwindow.dll \
 	filebrowser.dll
+# Split Window is broken on Windows
+#	splitwindow.dll
 
 .c.dll:
 	$(CC) $(MINGW_CFLAGS) -o $@.o -c $<

Modified: trunk/plugins/makefile.win32
===================================================================
--- trunk/plugins/makefile.win32	2011-03-27 15:28:02 UTC (rev 5638)
+++ trunk/plugins/makefile.win32	2011-03-27 16:02:21 UTC (rev 5639)
@@ -56,9 +56,10 @@
 		classbuilder.dll \
 		export.dll \
 		saveactions.dll \
-		splitwindow.dll \
 		filebrowser.dll
 
+# Split Window is broken on Windows
+#		splitwindow.dll
 
 clean:
 	-$(RM) deps.mak *.o *.dll

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2011-03-27 15:28:02 UTC (rev 5638)
+++ trunk/wscript	2011-03-27 16:02:21 UTC (rev 5639)
@@ -352,7 +352,7 @@
         build_plugin('filebrowser')
         build_plugin('htmlchars')
         build_plugin('saveactions')
-        build_plugin('splitwindow')
+        build_plugin('splitwindow', not is_win32)
 
     # Translations
     if bld.env['INTLTOOL']:


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



More information about the Commits mailing list