GNOME.org
 

[gcompris] windows: updated the compilation chain for windows to compile against GTK 2.24

commit a6b7a33fe9adc70dd7ea494b661f503862ddc4f0
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Tue Dec 27 18:02:24 2011 +0100

    windows: updated the compilation chain for windows to compile against GTK 2.24

 Makefile.mingw.in                |    7 ++++---
 README.mingw                     |    8 ++++++++
 global_win32.mak                 |    2 +-
 global_win32_activity.mak        |    3 ++-
 src/boards/Makefile.mingw        |    3 ++-
 src/gcompris/Makefile.mingw      |    5 +++--
 src/goocanvas/src/Makefile.mingw |    3 ++-
 tools/py2exe/gcompris.py         |    3 ++-
 8 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 4c8b2a6..0945a0a 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -80,7 +80,7 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(GTK_TOP)/bin/libpangoft2-1.0-0.dll \
 			$(GTK_TOP)/bin/libpangowin32-1.0-0.dll \
 			$(GTK_TOP)/bin/libgio-2.0-0.dll \
-			$(GTK_TOP)/bin/libpng12-0.dll \
+			$(GTK_TOP)/bin/libpng14-14.dll \
 			$(GTK_TOP)/bin/zlib1.dll \
 			$(ICONV_TOP)/bin/iconv.dll \
 			$(LIBXML2_TOP)/bin/libxml2.dll \
@@ -145,6 +145,7 @@ prepack: Makefile.mingw
 	cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/share/locale $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/gdk-pixbuf-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
 	cp $(LOCAL_PREFIX)/libxml2-2.7.6.win32/bin/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/bin
@@ -153,10 +154,10 @@ prepack: Makefile.mingw
 python: Makefile.mingw
 	cp $(PYTHON_TOP)/DLLs/tcl85.dll $(GCOMPRIS_INSTALL_DIR)
 	cp $(PYTHON_TOP)/DLLs/tk85.dll $(GCOMPRIS_INSTALL_DIR)
-	cp $(PYTHON_TOP)/python26.dll $(GCOMPRIS_INSTALL_DIR)
+	cp $(PYTHON_TOP)/python27.dll $(GCOMPRIS_INSTALL_DIR)
 	cp tools/py2exe/gcompris.py $(GCOMPRIS_INSTALL_DIR)
 	cp tools/py2exe/setup.py $(GCOMPRIS_INSTALL_DIR)
-	cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python26.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
+	cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python27.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
 	rm -f $(GCOMPRIS_INSTALL_DIR)/tcl85.dll
 	rm -f $(GCOMPRIS_INSTALL_DIR)/tk85.dll
 
diff --git a/README.mingw b/README.mingw
index a6d5c8f..7370349 100644
--- a/README.mingw
+++ b/README.mingw
@@ -69,6 +69,14 @@ be provided and where.
   make -f Makefile.mingw install - include the generated code in the installer directory
 
 * Now on the windows system:
+  Preparation on Windows for python:
+  - Install Python on Windows
+  - Copy the pythonxx.dll from the c:\Windows\System32 in c:\Pythonxx
+  - Install py2exe-0.6.9.win32-pyx.x.exe
+  - Intall pycairo-1.8.10.win32-pyx.x.exe from http://ftp.gnome.org/pub/GNOME/binaries/win32
+  - Install pygobject
+  - Install pygtk
+
   make -f Makefile.mingw python - create an embedded python interpreter
 
 * the win32-install-dir contains anything needed to run and package GCompris.
diff --git a/global_win32.mak b/global_win32.mak
index 5216336..5f5bcea 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -59,7 +59,7 @@ LIBXML2_TOP :=		$(LOCAL_PREFIX)/libxml2
 SDL_TOP :=		$(LOCAL_PREFIX)/sdl
 SDLMIXER_TOP :=		$(LOCAL_PREFIX)/sdl_mixer
 GNUCHESS_TOP :=		$(LOCAL_PREFIX)/gnuchess
-PYTHON_TOP :=		$(LOCAL_PREFIX)/Python26
+PYTHON_TOP :=		$(LOCAL_PREFIX)/Python27
 GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
 SQLITE_TOP :=		$(LOCAL_PREFIX)/sqlite
 FONTCONFIG_TOP :=	$(LOCAL_PREFIX)/gtk
diff --git a/global_win32_activity.mak b/global_win32_activity.mak
index 28c2a70..b027429 100644
--- a/global_win32_activity.mak
+++ b/global_win32_activity.mak
@@ -34,6 +34,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GLIB_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
+			-I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
 			-I$(GLIB_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/include/atk-1.0 \
@@ -48,7 +49,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(PYTHON_TOP)/include/pycairo \
 			-I$(SQLITE_TOP) \
 			-I$(ICONV_TOP)/include \
-			-I$(RSVG_TOP)/include/librsvg-2
+			-I$(RSVG_TOP)/include/librsvg-2.0
 
 
 ##
diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw
index 8a59f52..794b5e8 100644
--- a/src/boards/Makefile.mingw
+++ b/src/boards/Makefile.mingw
@@ -41,6 +41,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GLIB_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
+			-I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
 			-I$(GLIB_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/include/atk-1.0 \
@@ -55,7 +56,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(PYTHON_TOP)/include/pycairo \
 			-I$(SQLITE_TOP) \
 			-I$(ICONV_TOP)/include \
-			-I$(RSVG_TOP)/include/librsvg-2
+			-I$(RSVG_TOP)/include/librsvg-2.0
 
 
 ##
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index c896030..ad41f20 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -43,6 +43,7 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 			-I$(GLIB_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
 			-I$(GLIB_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/include/freetype2 \
@@ -50,7 +51,7 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 			-I$(SDLMIXER_TOP)/include \
 			-I$(LIBXML2_TOP)/include \
 			-I$(CAIRO_TOP)/include/cairo \
-			-I$(RSVG_TOP)/include/librsvg-2 \
+			-I$(RSVG_TOP)/include/librsvg-2.0 \
 			-I$(SQLITE_TOP) \
 			-I$(GCOMPRIS_TOP) \
 			-I$(GCOMPRIS_TOP)/src/boards \
@@ -182,7 +183,7 @@ EXE_LIBS =		../boards/libboards.a \
 			-lSDLmain -lSDL -lSDL_mixer \
 			-lpangoft2-1.0 \
 			-liconv \
-			-lpython26 \
+			-lpython27 \
 			-lsqlite3 \
 			-lcairo \
 			-lpangocairo-1.0 \
diff --git a/src/goocanvas/src/Makefile.mingw b/src/goocanvas/src/Makefile.mingw
index d5e5c45..97510fb 100644
--- a/src/goocanvas/src/Makefile.mingw
+++ b/src/goocanvas/src/Makefile.mingw
@@ -47,6 +47,7 @@ INCLUDE_PATHS +=	-I$(GTK_TOP)/include \
 			-I$(GLIB_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
 			-I$(GLIB_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/include/freetype2 \
@@ -57,7 +58,7 @@ INCLUDE_PATHS +=	-I$(GTK_TOP)/include \
 			-I$(FONTCONFIG_TOP) \
 			-I$(FREETYPE_TOP)/include \
 			-I$(FREETYPE_TOP)/include/freetype2/ \
-			-I$(RSVG_TOP)/include/librsvg-2 \
+			-I$(RSVG_TOP)/include/librsvg-2.0 \
 			-I.
 
 
diff --git a/tools/py2exe/gcompris.py b/tools/py2exe/gcompris.py
index 3b4eeb4..772a375 100755
--- a/tools/py2exe/gcompris.py
+++ b/tools/py2exe/gcompris.py
@@ -23,6 +23,7 @@ import atk
 import gobject
 import uuid
 import ConfigParser
-from sqlite3 import dbapi2 as sqlite 
+import gio
+from sqlite3 import dbapi2 as sqlite
 
 print "Hello gcompris world now"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]