SF.net SVN: geany: [1850] trunk

[eht16 at users.sourceforge.net]

Revision: 1850
          http://geany.svn.sourceforge.net/geany/?rev=1850&view=rev
Author:   eht16
Date:     2007-09-03 11:19:27 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
Sort list of files to build on Windows. Add geanyobject.c to the list of files to build on Windows. Fix some warnings and build errors on Windows.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/makefile.win32
    trunk/src/makefile.win32
    trunk/src/ui_utils.c
    trunk/src/win32.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-03 16:25:41 UTC (rev 1849)
+++ trunk/ChangeLog	2007-09-03 18:19:27 UTC (rev 1850)
@@ -1,3 +1,12 @@
+2007-09-03  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/makefile.win32, src/ui_utils.c, src/win32.c,
+   plugins/makefile.win32:
+   Sort list of files to build on Windows.
+   Add geanyobject.c to the list of files to build on Windows.
+   Fix some warnings and build errors on Windows.
+
+
 2007-09-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/keybindings.c:

Modified: trunk/plugins/makefile.win32
===================================================================
--- trunk/plugins/makefile.win32	2007-09-03 16:25:41 UTC (rev 1849)
+++ trunk/plugins/makefile.win32	2007-09-03 18:19:27 UTC (rev 1850)
@@ -30,7 +30,7 @@
 	-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
 	-lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv
 
-CCFLAGS=-Wall -O2 -mms-bitfields
+CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H
 
 .PHONY: all clean plugins
 

Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32	2007-09-03 16:25:41 UTC (rev 1849)
+++ trunk/src/makefile.win32	2007-09-03 18:19:27 UTC (rev 1850)
@@ -44,10 +44,10 @@
 
 CCFLAGS=-Wall -O2 -g -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
 
-OBJS = treeviews.o templates.o encodings.o about.o prefs.o win32.o build.o msgwindow.o dialogs.o \
-	filetypes.o interface.o main.o support.o callbacks.o utils.o ui_utils.o socket.o \
-	highlighting.o editor.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o \
-	symbols.o tools.o project.o navqueue.o plugins.o
+OBJS =	about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o filetypes.o \
+		geanyobject.o highlighting.o interface.o keybindings.o keyfile.o main.o msgwindow.o \
+		navqueue.o notebook.o plugins.o prefs.o project.o sciwrappers.o search.o socket.o  \
+		support.o symbols.o templates.o treeviews.o tools.o ui_utils.o utils.o win32.o
 
 .c.o:
 	$(CC) $(CCFLAGS) -c $<

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2007-09-03 16:25:41 UTC (rev 1849)
+++ trunk/src/ui_utils.c	2007-09-03 18:19:27 UTC (rev 1850)
@@ -574,7 +574,9 @@
 	for (i = 0; i < G_N_ELEMENTS(widgets.document_buttons); i++)
 		gtk_widget_set_sensitive(widgets.document_buttons[i], enable);
 
+#ifdef HAVE_PLUGINS
 	plugins_update_document_sensitive(enable);
+#endif
 }
 
 

Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c	2007-09-03 16:25:41 UTC (rev 1849)
+++ trunk/src/win32.c	2007-09-03 18:19:27 UTC (rev 1850)
@@ -50,6 +50,7 @@
 #include "ui_utils.h"
 #include "sciwrappers.h"
 #include "dialogs.h"
+#include "filetypes.h"
 
 
 


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