Better compilation process for windows.

Take care of internal gnomecanvas and libart_lgpl from now.

3 files changed, 26 insertions, 29 deletions

diff --git a/global_win32.mak b/global_win32.mak
index e89b263..4defcff 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -15,9 +15,22 @@ CFLAGS += -g -Wall -mno-cygwin -mms-bitfields
 
 # If not specified, dlls are built with the default base address of 0x10000000.
 # When loaded into a process address space a dll will be rebased if its base
-# address colides with the base address of an existing dll.  To avoid rebasing 
+# address colides with the base address of an existing dll.  To avoid rebasing
 # we do the following.  Rebasing can slow down the load time of dlls and it
 # also renders debug info useless.
 DLL_LD_FLAGS += -Wl,--enable-auto-image-base
 
 DEFINES += 	-DHAVE_CONFIG_H
+
+LOCAL_PREFIX:=
+GTK_TOP :=		$(LOCAL_PREFIX)/gtk
+GLIB_TOP :=		$(LOCAL_PREFIX)/gtk
+CAIRO_TOP :=		$(LOCAL_PREFIX)/gtk
+GNUWIN32_TOP :=		$(LOCAL_PREFIX)/gnuwin32
+LIBXML2_TOP :=		$(LOCAL_PREFIX)/libxml2
+SDL_TOP :=		$(LOCAL_PREFIX)/sdl
+GNUCHESS_TOP :=		$(LOCAL_PREFIX)/gnuchess
+PYTHON_TOP :=		$(LOCAL_PREFIX)/Python24
+GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
+SQLITE_TOP :=		$(LOCAL_PREFIX)/sqlite
+FONTCONFIG_TOP :=	$(LOCAL_PREFIX)/fontconfig
diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw
index 61febb5..9267936 100644
--- a/src/boards/Makefile.mingw
+++ b/src/boards/Makefile.mingw
@@ -10,16 +10,9 @@
 
 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
+CANVAS_TOP :=		$(GCOMPRIS_TOP)/src/libgnomecanvas
+LIBART_TOP :=		$(GCOMPRIS_TOP)/src/libart_lgpl
 GCOMPRIS_INSTALL_DIR :=	$(GCOMPRIS_TOP)/win32-install-dir
-SQLITE_TOP := /sqlite
 
 ##
 ## VARIABLE DEFINITIONS
@@ -49,12 +42,11 @@ INCLUDE_PATHS +=	-I$(GCOMPRIS_PLUGINS) \
 			-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/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$(CANVAS_TOP) \
 			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/include/libart-2.0 \
+			-I$(LIBART_TOP) \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(LIBXML2_TOP)/include \
 			-I$(GNUWIN32_TOP)/include \
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index d006d14..70ad7a8 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -8,19 +8,12 @@
 # PATHS
 #
 
-INCLUDE_DIR :=		.
-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_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
-SQLITE_TOP :=		/sqlite
 
 ##
 ## VARIABLE DEFINITIONS
@@ -57,9 +50,9 @@ 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$(CANVAS_TOP)/include/libgnomecanvas-2.0 \
+			-I$(CANVAS_TOP) \
 			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/include/libart-2.0 \
+			-I$(LIBART_TOP) \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(SDL_TOP)/include/SDL \
 			-I$(LIBXML2_TOP)/include \
@@ -75,7 +68,7 @@ LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
 			-L$(GNUWIN32_TOP)/lib \
 			-L$(SDL_TOP)/lib \
-			-L$(CANVAS_TOP)/lib \
+			-L$(CANVAS_TOP) \
 			-L$(PYTHON_TOP)/libs \
 			-L$(SQLITE_TOP) \
 			-L$(GCOMPRIS_TOP)/src/gcompris
@@ -132,6 +125,8 @@ 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 \
@@ -143,11 +138,8 @@ EXE_LIBS =		../boards/libboards.a \
 			-lgmodule-2.0 \
 			-lgdk_pixbuf-2.0 \
 			-lws2_32 \
-			-lpopt \
 			-lxml2 \
 			-lSDLmain -lSDL -lSDL_mixer \
-			-lgnomecanvas-2 \
-			-lart_lgpl_2 \
 			-lpangoft2-1.0 \
 			-liconv \
 			-lpython24 \