diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/boards/Makefile.mingw | 18 | ||||
| -rw-r--r-- | src/boards/chess.c | 8 | ||||
| -rw-r--r-- | src/gcompris/Makefile.mingw | 35 |
5 files changed, 31 insertions, 43 deletions
@@ -1,4 +1,13 @@ -2008-03-23 Bruno Coudoin,,, <set EMAIL_ADDRESS environment variable> +2008-04-06 Bruno coudoin <bruno.coudoin@free.fr> + + Updated compilation chain for windows. + + * Makefile.am: + * src/boards/Makefile.mingw: + * src/boards/chess.c: + * src/gcompris/Makefile.mingw: + +2008-03-23 Bruno Coudoin,,, <bruno.coudoin@free.fr> * src/boards/memory.c: (get_random_token), (create_item): Patch from Karl Ove Hufthammer to display 1 + 2 instead of 1+2 and make the text diff --git a/Makefile.am b/Makefile.am index aadffcf..06c410a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,7 @@ dist-hook: 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 diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw index 459c0f3..eff818b 100644 --- a/src/boards/Makefile.mingw +++ b/src/boards/Makefile.mingw @@ -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 @@ INCLUDE_PATHS += -I$(GCOMPRIS_PLUGINS) \ -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 @@ INCLUDE_PATHS += -I$(GCOMPRIS_PLUGINS) \ -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 @@ LIBS = -lgtk-win32-2.0 \ -lgmodule-2.0 \ -lgdk_pixbuf-2.0 \ -lpango-1.0 \ - -lgnomecanvas-2 \ - -lart_lgpl_2 \ -lpangoft2-1.0 \ -latk-1.0 \ -lpangowin32-1.0 \ diff --git a/src/boards/chess.c b/src/boards/chess.c index a58e58d..1ef9308 100644 --- a/src/boards/chess.c +++ b/src/boards/chess.c @@ -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; diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw index d372b7f..b29d5c9 100644 --- a/src/gcompris/Makefile.mingw +++ b/src/gcompris/Makefile.mingw @@ -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 @@ LDFLAGS = -mwindows -mno-cygwin -mms-bitfields ## INCLUDE MAKEFILES ## +GCOMPRIS_TOP := ../.. include $(GCOMPRIS_TOP)/global_win32.mak ## @@ -58,9 +42,8 @@ INCLUDE_PATHS += -I$(INCLUDE_DIR) \ -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 @@ INCLUDE_PATHS += -I$(INCLUDE_DIR) \ 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 @@ EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o) ## 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 @@ EXE_LIBS = ../libgnomecanvas/libgnomecanvas.a \ -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 @@ EXE_LIBS = ../libgnomecanvas/libgnomecanvas.a \ all: $(TARGET).exe install: all - cp $(GCOMPRIS_SRC)/gcompris.exe $(GCOMPRIS_INSTALL_DIR) + cp gcompris.exe $(GCOMPRIS_INSTALL_DIR) # # BUILD EXE |