diff options
| author | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-18 11:37:01 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-19 21:54:25 (GMT) |
| commit | 1af78740eab098e64a57d99d4e507a22c20c3cb3 (patch) | |
| tree | 2d244d4613a1b3bc72169198755adfe71103aa80 /src/gcompris | |
| parent | 256b602fe90d68f54bbd2ede0c028b04350cd7f2 (diff) | |
Synced windows port with files from the GCOMPRIS_8_3 branch.
Diffstat (limited to 'src/gcompris')
| -rw-r--r-- | src/gcompris/Makefile.mingw | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw index b29d5c9..f9d8d55 100644 --- a/src/gcompris/Makefile.mingw +++ b/src/gcompris/Makefile.mingw @@ -4,6 +4,17 @@ # Description: Makefile for win32 (mingw) version of GCompris # +# +# PATHS +# + +GCOMPRIS_TOP := ../.. +INCLUDE_DIR := . +CANVAS_TOP := $(GCOMPRIS_TOP)/src +LIBART_TOP := $(GCOMPRIS_TOP)/src/libart_lgpl +GCOMPRIS_SRC := . +GCOMPRIS_INSTALL_DIR := $(GCOMPRIS_TOP)/win32-install-dir + ## ## VARIABLE DEFINITIONS ## @@ -25,7 +36,6 @@ LDFLAGS = -mwindows -mno-cygwin -mms-bitfields ## INCLUDE MAKEFILES ## -GCOMPRIS_TOP := ../.. include $(GCOMPRIS_TOP)/global_win32.mak ## @@ -40,27 +50,27 @@ INCLUDE_PATHS += -I$(INCLUDE_DIR) \ -I$(GTK_TOP)/include/atk-1.0 \ -I$(GLIB_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ - -I.. \ + -I$(CANVAS_TOP) \ -I$(GTK_TOP)/include/atk-1.0 \ + -I$(LIBART_TOP) \ -I$(GTK_TOP)/include/freetype2 \ - -I$(GSTREAMER_TOP)/include/gstreamer-0.10 \ + -I$(SDL_TOP)/include/SDL \ -I$(LIBXML2_TOP)/include \ - -I$(GNUWIN32_TOP)/include \ -I$(CAIRO_TOP)/include/cairo \ -I$(SQLITE_TOP) \ - -L$(GSTREAMER_TOP) \ -I$(GCOMPRIS_TOP) \ - -I$(GCOMPRIS_TOP)/src/boards + -I$(GCOMPRIS_TOP)/src/boards \ + -I$(ICONV_TOP)/include LIB_PATHS = -L$(GTK_TOP)/lib \ -L$(GLIB_TOP)/lib \ - -L$(LIBXML2_TOP)/bin \ - -L$(GNUWIN32_TOP)/lib \ - -L$(GSTREAMER_TOP)/bin \ - -L$(CANVAS_TOP)/lib \ + -L$(LIBXML2_TOP)/lib \ + -L$(SDL_TOP)/lib \ + -L$(CANVAS_TOP) \ -L$(PYTHON_TOP)/libs \ -L$(SQLITE_TOP) \ + -L$(ICONV_TOP)/lib \ -L$(GCOMPRIS_TOP)/src/gcompris @@ -75,8 +85,12 @@ EXE_C_SRC = \ binreloc.c \ board.c \ board_config.c \ + board_config_combo.c \ + board_config_common.c \ + board_config_radio.c \ + board_config_textview.c \ + board_config_wordlist.c \ bonus.c \ - cache.c \ config.c \ dialog.c \ drag.c \ @@ -98,6 +112,8 @@ EXE_C_SRC = \ score.c \ skin.c \ soundutil.c \ + soundutil_sdl.c \ + sdlplayer.c \ timer.c \ wordlist.c @@ -110,10 +126,13 @@ EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o) ## EXE_LIBS = ../boards/libboards.a \ + ../libgnomecanvas/libgnomecanvas.a \ + ../libart_lgpl/libart_lgpl.a \ -lgtk-win32-2.0 \ -latk-1.0 \ -lpango-1.0 \ -lglib-2.0 \ + -lgthread-2.0 \ -lgdk-win32-2.0 \ -lgobject-2.0 \ -lintl \ @@ -121,9 +140,7 @@ EXE_LIBS = ../boards/libboards.a \ -lgdk_pixbuf-2.0 \ -lws2_32 \ -lxml2 \ - -lgnomecanvas-2 \ - -lart_lgpl_2 \ - -lgstreamer-0.10 \ + -lSDLmain -lSDL -lSDL_mixer \ -lpangoft2-1.0 \ -liconv \ -lpython24 \ @@ -141,7 +158,7 @@ EXE_LIBS = ../boards/libboards.a \ # How to make an RC file %.o: %.rc - windres -i $< -o $@ + $(WINDRES) -i $< -o $@ ## ## TARGET DEFINITIONS @@ -152,7 +169,7 @@ EXE_LIBS = ../boards/libboards.a \ all: $(TARGET).exe install: all - cp gcompris.exe $(GCOMPRIS_INSTALL_DIR) + cp $(GCOMPRIS_SRC)/gcompris.exe $(GCOMPRIS_INSTALL_DIR) # # BUILD EXE |