gcompris r3352 - in trunk: . src/boards src/gcompris
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3352 - in trunk: . src/boards src/gcompris
- Date: Sun, 6 Apr 2008 16:45:11 +0100 (BST)
Author: bcoudoin
Date: Sun Apr 6 16:45:11 2008
New Revision: 3352
URL: http://svn.gnome.org/viewvc/gcompris?rev=3352&view=rev
Log:
Updated compilation chain for windows.
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/src/boards/Makefile.mingw
trunk/src/boards/chess.c
trunk/src/gcompris/Makefile.mingw
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sun Apr 6 16:45:11 2008
@@ -74,7 +74,7 @@
fi
-CLEANFILES = core-translation-report gcompris.desktop gcompris-edit.desktop config.h.mingw
+CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw
clean-local:
rm -f intltool-extract intltool-merge intltool-update
Modified: trunk/src/boards/Makefile.mingw
==============================================================================
--- trunk/src/boards/Makefile.mingw (original)
+++ trunk/src/boards/Makefile.mingw Sun Apr 6 16:45:11 2008
@@ -10,16 +10,6 @@
GCOMPRIS_PLUGINS := .
GCOMPRIS_TOP := ../..
-GTK_TOP := /gtk
-GLIB_TOP := /glib
-GNUWIN32_TOP := /gnuwin32
-LIBXML2_TOP := /libxml2
-SDL_TOP := /sdl
-CANVAS_TOP := /gnomecanvas
-PYTHON_TOP := /c/Python24
-CAIRO_TOP := /cairo
-GCOMPRIS_INSTALL_DIR := $(GCOMPRIS_TOP)/win32-install-dir
-SQLITE_TOP := /sqlite
##
## VARIABLE DEFINITIONS
@@ -52,9 +42,7 @@
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GLIB_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
- -I$(CANVAS_TOP)/include/libgnomecanvas-2.0 \
-I$(GTK_TOP)/include/atk-1.0 \
- -I$(GTK_TOP)/include/libart-2.0 \
-I$(GTK_TOP)/include/freetype2 \
-I$(LIBXML2_TOP)/include \
-I$(GNUWIN32_TOP)/include \
@@ -63,7 +51,9 @@
-I$(CAIRO_TOP)/include/cairo \
-I$(PYTHON_TOP)/include \
-I$(PYTHON_TOP)/include/pygtk-2.0 \
- -I$(SQLITE_TOP)
+ -I$(SQLITE_TOP) \
+ -I$(CANVAS_TOP)/include/libgnomecanvas-2.0 \
+ -I$(CANVAS_TOP)/include/libart-2.0
@@ -86,8 +76,6 @@
-lgmodule-2.0 \
-lgdk_pixbuf-2.0 \
-lpango-1.0 \
- -lgnomecanvas-2 \
- -lart_lgpl_2 \
-lpangoft2-1.0 \
-latk-1.0 \
-lpangowin32-1.0 \
Modified: trunk/src/boards/chess.c
==============================================================================
--- trunk/src/boards/chess.c (original)
+++ trunk/src/boards/chess.c Sun Apr 6 16:45:11 2008
@@ -32,6 +32,14 @@
# define WIN32
#endif
+#ifndef SIGPIPE
+#define SIGPIPE 13
+#endif
+
+#ifndef SIGTRAP
+#define SIGTRAP 5
+#endif
+
#define SOUNDLISTFILE PACKAGE
static GcomprisBoard *gcomprisBoard = NULL;
Modified: trunk/src/gcompris/Makefile.mingw
==============================================================================
--- trunk/src/gcompris/Makefile.mingw (original)
+++ trunk/src/gcompris/Makefile.mingw Sun Apr 6 16:45:11 2008
@@ -4,23 +4,6 @@
# Description: Makefile for win32 (mingw) version of GCompris
#
-#
-# PATHS
-#
-
-INCLUDE_DIR := .
-GTK_TOP := /gtk
-GLIB_TOP := /glib
-GNUWIN32_TOP := /gnuwin32
-LIBXML2_TOP := /libxml2
-GSTREAMER_TOP := /gstreamer
-PYTHON_TOP := /c/Python24
-CAIRO_TOP := /cairo
-GCOMPRIS_TOP := ../..
-GCOMPRIS_SRC := .
-GCOMPRIS_INSTALL_DIR := $(GCOMPRIS_TOP)/win32-install-dir
-SQLITE_TOP := /sqlite
-
##
## VARIABLE DEFINITIONS
##
@@ -42,6 +25,7 @@
## INCLUDE MAKEFILES
##
+GCOMPRIS_TOP := ../..
include $(GCOMPRIS_TOP)/global_win32.mak
##
@@ -58,9 +42,8 @@
-I$(GTK_TOP)/lib/gtk-2.0/include \
-I.. \
-I$(GTK_TOP)/include/atk-1.0 \
- -I$(GTK_TOP)/src/libart_lgpl \
-I$(GTK_TOP)/include/freetype2 \
- -I$(GSTREAME_TOP)/include/gstreamer-0.10 \
+ -I$(GSTREAMER_TOP)/include/gstreamer-0.10 \
-I$(LIBXML2_TOP)/include \
-I$(GNUWIN32_TOP)/include \
-I$(CAIRO_TOP)/include/cairo \
@@ -72,9 +55,9 @@
LIB_PATHS = -L$(GTK_TOP)/lib \
-L$(GLIB_TOP)/lib \
- -L$(LIBXML2_TOP)/lib \
+ -L$(LIBXML2_TOP)/bin \
-L$(GNUWIN32_TOP)/lib \
- -L$(GSTREAMER_TOP)/lib \
+ -L$(GSTREAMER_TOP)/bin \
-L$(CANVAS_TOP)/lib \
-L$(PYTHON_TOP)/libs \
-L$(SQLITE_TOP) \
@@ -126,9 +109,7 @@
## LIBRARIES
##
-EXE_LIBS = ../libgnomecanvas/libgnomecanvas.a \
- ../libart_lgpl/libart_lgpl.a \
- ../boards/libboards.a \
+EXE_LIBS = ../boards/libboards.a \
-lgtk-win32-2.0 \
-latk-1.0 \
-lpango-1.0 \
@@ -140,7 +121,9 @@
-lgdk_pixbuf-2.0 \
-lws2_32 \
-lxml2 \
- -lgstreamer-0.10-0 \
+ -lgnomecanvas-2 \
+ -lart_lgpl_2 \
+ -lgstreamer-0.10 \
-lpangoft2-1.0 \
-liconv \
-lpython24 \
@@ -169,7 +152,7 @@
all: $(TARGET).exe
install: all
- cp $(GCOMPRIS_SRC)/gcompris.exe $(GCOMPRIS_INSTALL_DIR)
+ cp gcompris.exe $(GCOMPRIS_INSTALL_DIR)
#
# BUILD EXE
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]