Hi,

I got Geany to build on Windows XP using the latest SVN. There were some things I needed to change to make the build work. I've attached a patch to show what I changed.

This patch isn't meant to be applied directly, just to show what I needed to do to make Geany build. The main problems were using make escape character \ as a path separator and missing gdk-pixbuf-2.0 include in GTK_INCLUDES.

Now I just need to figure out how to install it :)

Cheers,
Matthew Brush
Index: scintilla/makefile.win32
===================================================================
--- scintilla/makefile.win32	(revision 5676)
+++ scintilla/makefile.win32	(working copy)
@@ -22,6 +22,7 @@
 GTK_INCLUDES= \
 	-I$(PREFIX)/include/gtk-2.0 \
 	-I$(PREFIX)/lib/gtk-2.0/include \
+	-I$(PREFIX)/include/gdk-pixbuf-2.0 \
 	-I$(PREFIX)/include/atk-1.0 \
 	-I$(PREFIX)/include/pango-1.0 \
 	-I$(PREFIX)/include/cairo \
@@ -138,7 +139,7 @@
 	$(RANLIB) $@
 
 deps.mak:
-	$(CC) -MM  $(CXXFLAGS) gtk\*.cxx lexers\*.cxx lexlib\*.cxx src\*.cxx >deps.mak
+	$(CC) -MM  $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
 
 # Generate header dependencies with "make deps.mak"
 include deps.mak
Index: localwin32.mk
===================================================================
--- localwin32.mk	(revision 0)
+++ localwin32.mk	(revision 0)
@@ -0,0 +1,3 @@
+CP = cp
+RM = rm
+PREFIX = C:/Gtk+
Index: src/makefile.win32
===================================================================
--- src/makefile.win32	(revision 5676)
+++ src/makefile.win32	(working copy)
@@ -22,6 +22,7 @@
 GTK_INCLUDES= \
 	-I$(PREFIX)/include/gtk-2.0 \
 	-I$(PREFIX)/lib/gtk-2.0/include \
+	-I$(PREFIX)/include/gdk-pixbuf-2.0 \
 	-I$(PREFIX)/include/atk-1.0 \
 	-I$(PREFIX)/include/pango-1.0 \
 	-I$(PREFIX)/include/cairo \
Index: tagmanager/makefile.win32
===================================================================
--- tagmanager/makefile.win32	(revision 5676)
+++ tagmanager/makefile.win32	(working copy)
@@ -3,7 +3,7 @@
 CC = gcc
 AR = ar
 RANLIB = ranlib
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../localwin32.mk
 
Index: makefile.win32
===================================================================
--- makefile.win32	(revision 5676)
+++ makefile.win32	(working copy)
@@ -22,7 +22,7 @@
 # Note: && is needed after cd because each line is executed in a different
 # shell. (cd .. is just for clarity).
 all: check-tools config.h
-	cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\..
+	cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../..
 	cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
 	cd scintilla && $(MAKE) -f makefile.win32 && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 && cd ..
@@ -38,14 +38,14 @@
 	$(CP) $< $@
 
 deps:
-	-$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak
+	-$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
 
 # used by src/makefile.win32 to avoid del ../file which is an error
 clean-local:
 	-$(RM) geany_private.res geany.exe
 
 clean: deps
-	cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\..
+	cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../..
 	cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
 	cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
Index: plugins/makefile.win32
===================================================================
--- plugins/makefile.win32	(revision 5676)
+++ plugins/makefile.win32	(working copy)
@@ -11,6 +11,7 @@
 GTK_INCLUDES= \
 	-I$(PREFIX)/include/gtk-2.0 \
 	-I$(PREFIX)/lib/gtk-2.0/include \
+	-I$(PREFIX)/include/gdk-pixbuf-2.0 \
 	-I$(PREFIX)/include/atk-1.0 \
 	-I$(PREFIX)/include/pango-1.0 \
 	-I$(PREFIX)/include/cairo \
_______________________________________________
Geany-devel mailing list
[email protected]
https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel

Reply via email to