Commit 0dc85832 authored by Bruno Coudoin's avatar Bruno Coudoin

Windows port updated. Not functional yet.

	A new macro has been added to declare a gcompris activity.
	This macro make the declaration for a dynamic link on every
	good enough operating system. On windows, this macro declares
	the boards as static.
parent fee60771
2005-05-02 Bruno coudoin <bruno.coudoin@free.fr>
Windows port updated. Not functional yet.
A new macro has been added to declare a gcompris activity.
This macro make the declaration for a dynamic link on every
good enough operating system. On windows, this macro declares
the boards as static.
* src/boards/Makefile.am:
* src/boards/Makefile.mingw:
* src/boards/advanced_colors.c:
* src/boards/algebra.c:
* src/boards/algebra_guesscount.c:
* src/boards/canal_lock.c:
* src/boards/chess.c:
* src/boards/click_on_letter.c:
* src/boards/clickgame.c:
* src/boards/clockgame.c:
* src/boards/colors.c:
* src/boards/draw.c:
* src/boards/enumerate.c:
* src/boards/erase.c:
* src/boards/fifteen.c:
* src/boards/gletters.c:
* src/boards/hanoi.c:
* src/boards/imageid.c:
* src/boards/leftright.c:
* src/boards/machpuzzle.c:
* src/boards/maze.c:
* src/boards/memory.c:
* src/boards/menu.c:
* src/boards/missingletter.c:
* src/boards/money.c:
* src/boards/paratrooper.c:
* src/boards/planegame.c:
* src/boards/python.c:
* src/boards/railroad.c:
* src/boards/read_colors.c:
* src/boards/reading.c:
* src/boards/reversecount.c:
* src/boards/shapegame.c:
* src/boards/smallnumbers.c:
* src/boards/submarine.c:
* src/boards/superbrain.c:
* src/boards/target.c:
* src/boards/traffic.c:
* src/boards/wordsgame.c:
* src/gcompris/Makefile.mingw:
* src/gcompris/board.c: (board_check_file):
* src/gcompris/board.h:
* src/gcompris/file_selector.c: (display_files),
(item_event_file_selector):
* src/gcompris/gameutil.c:
* src/gcompris/gcompris.c:
* src/gcompris/gcompris.h:
* src/gcompris/properties.c: (gcompris_properties_new):
* src/gcompris/sdlplayer.c: (sdlplayer):
2005-05-02 Bruno coudoin <bruno.coudoin@free.fr>
Many little changes to ease the windows port. Now uses the glib
......
......@@ -17,7 +17,6 @@ lib_LTLIBRARIES = \
libclickgame.la \
libclockgame.la \
libcolors.la \
libdraw.la \
liberase.la \
libenumerate.la \
libfifteen.la \
......
#
# Makefile.mingw
#
# Description: Makefile for win32 (mingw) version of GCompris Boards (Plugins)
#
#
# PATHS
#
GCOMPRIS_PLUGINS := .
GCOMPRIS_TOP := ../..
GTK_TOP := /gtk
GNUWIN32_TOP := /gnuwin32
LIBXML2_TOP := /libxml2
SDL_TOP := /sdl
CANVAS_TOP := /gnomecanvas
GCOMPRIS_INSTALL_DIR := $(GCOMPRIS_TOP)/win32-install-dir
##
## VARIABLE DEFINITIONS
##
# Compiler Options
CFLAGS =
DEFINES =
.SUFFIXES:
.SUFFIXES: .c .a
##
## INCLUDE MAKEFILES
##
include $(GCOMPRIS_TOP)/global_win32.mak
##
## INCLUDE PATHS
##
INCLUDE_PATHS += -I$(GCOMPRIS_PLUGINS) \
-I$(GTK_TOP)/include \
-I$(GTK_TOP)/include/gtk-2.0 \
-I$(GTK_TOP)/include/glib-2.0 \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_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 \
-I$(GCOMPRIS_TOP) \
-I$(GCOMPRIS_TOP)/src
LIB_PATHS = -L$(GTK_TOP)/lib \
-L$(LIBXML2_TOP)/lib \
-L$(GNUWIN32_TOP)/lib \
-L$(SDL_TOP)/lib \
-L$(GCOMPRIS_TOP)/src/gcompris
##
## LIBRARIES
##
LIBS = -lgtk-win32-2.0 \
-lglib-2.0 \
-lgdk-win32-2.0 \
-lgobject-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 \
-lgdi32 -lgthread-2.0 \
-lintl \
-lws2_32 \
libgcompris-1.la
##
## RULES
##
##
## TARGET DEFINITIONS
##
.PHONY: all clean
all: libboards
install:
##
## SOURCES, OBJECTS
##
BOARDS_C_SRC = \
algebra.c \
algebra_guesscount.c \
canal_lock.c \
click_on_letter.c \
clickgame.c \
clockgame.c \
colors.c \
erase.c \
enumerate.c \
fifteen.c \
gletters.c \
hanoi.c \
imageid.c \
leftright.c \
superbrain.c \
machpuzzle.c \
maze.c \
memory.c \
menu.c \
missingletter.c \
money.c \
money_widget.c \
paratrooper.c \
planegame.c \
railroad.c \
reading.c \
reversecount.c \
shapegame.c \
smallnumbers.c \
submarine.c \
target.c \
traffic.c \
wordsgame.c \
advanced_colors.c \
read_colors.c
BOARDS_OBJECTS = $(BOARDS_C_SRC:%.c=%.o)
#
# BUILD Boards staticlibrary
#
# How to make a C file
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@
.c.o:
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
libboards: \
libboards.a
libboards.a: $(BOARDS_OBJECTS)
-rm -f libboards.a
$(AR) cru libboards.a $(BOARDS_OBJECTS)
ranlib libboards.a
##
## CLEAN RULES
##
clean:
rm -rf *.o
rm -rf *.a
......@@ -104,9 +104,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(advanced_colors)
/* =====================================================================
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - algebra.c
*
* Time-stamp: <2005/03/30 22:01:14 bruno>
* Time-stamp: <2005/04/27 22:16:48 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -118,11 +118,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(algebra)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -163,9 +163,7 @@ static BoardPlugin menu_bp =
* Main entry point mandatory for each Gcompris's game
* ---------------------------------------------------
*/
BoardPlugin * get_bplugin_info(void){
return &menu_bp;
}
GET_BPLUGIN_INFO(algebra_guesscount)
/* ==================================== */
// in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -134,11 +134,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(canal_lock)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -155,11 +155,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(chess)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -101,11 +101,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(click_on_letter)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - clickgame.c
*
* Time-stamp: <2005/05/02 01:42:09 bruno>
* Time-stamp: <2005/05/02 01:58:00 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -106,12 +106,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(clickgame)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - clockgame.c
*
* Time-stamp: <2005/03/21 22:56:23 bruno>
* Time-stamp: <2005/04/26 00:22:52 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -99,11 +99,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(clockgame)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -92,9 +92,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(colors)
/* =====================================================================
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -236,11 +236,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(draw)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -112,11 +112,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(enumerate)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -104,11 +104,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(erase)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -77,11 +77,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(fifteen)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - gletters.c
*
* Time-stamp: <2005/03/30 21:41:45 bruno>
* Time-stamp: <2005/04/27 22:16:41 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -150,11 +150,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(gletters)
/*
* in : boolean TRUE = PAUSE : FALSE = UNPAUSE
......
......@@ -125,11 +125,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(hanoi)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -130,11 +130,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(imageid)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -124,9 +124,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(leftright)
/* =====================================================================
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -108,11 +108,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(machpuzzle)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -150,9 +150,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(maze)
/* =====================================================================
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - memory.c
*
* Time-stamp: <2004/10/21 22:58:58 bruno>
* Time-stamp: <2005/04/27 22:15:58 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -185,11 +185,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(memory)
/*
* in : boolean TRUE = PAUSE : FALSE = UNPAUSE
......
/* gcompris - menu.c
*
* Time-stamp: <2005/04/12 23:03:33 bruno>
* Time-stamp: <2005/04/26 00:22:40 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -94,11 +94,7 @@ static BoardPlugin menu_bp =
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(menu)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -122,11 +122,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(missingletter)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -108,11 +108,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(money)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - paratrooper.c
*
* Time-stamp: <2005/03/30 22:04:44 bruno>
* Time-stamp: <2005/04/27 22:32:14 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -123,11 +123,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(paratrooper)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - planegame.c
*
* Time-stamp: <2005/03/30 22:05:27 bruno>
* Time-stamp: <2005/04/27 22:16:32 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -98,11 +98,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(planegame)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -73,11 +73,7 @@ static BoardPlugin pythonboard_bp =
* Return the plugin structure (Common to all gcompris boards)
*/
BoardPlugin
*get_bplugin_info(void)
{
return &pythonboard_bp;
}
GET_BPLUGIN_INFO(python)
/*
......
......@@ -117,11 +117,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(railroad)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
......@@ -103,9 +103,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(read_colors)
/* =====================================================================
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - reading.c
*
* Time-stamp: <2005/04/30 23:14:18 bruno>
* Time-stamp: <2005/05/02 02:01:00 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -128,11 +128,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(reading)
/*
* in : boolean TRUE = PAUSE : FALSE = UNPAUSE
......
......@@ -158,11 +158,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(reversecount)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - shapegame.c
*
* Time-stamp: <2005/03/30 22:06:15 bruno>
* Time-stamp: <2005/04/27 22:16:21 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -190,11 +190,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(shapegame)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......
/* gcompris - smallnumbers.c
*
* Time-stamp: <2005/04/19 23:47:07 bruno>
* Time-stamp: <2005/05/02 02:01:35 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -84,11 +84,7 @@ static BoardPlugin menu_bp =
*
*/
BoardPlugin
*get_bplugin_info(void)
{
return &menu_bp;
}
GET_BPLUGIN_INFO(smallnumbers)
/*
* in : boolean TRUE = PAUSE : FALSE = UNPAUSE
......
......@@ -219,9 +219,7 @@ static BoardPlugin menu_bp =
/* =====================================================================
*
* =====================================================================*/
BoardPlugin *get_bplugin_info(void) {
return &menu_bp;
}
GET_BPLUGIN_INFO(submarine)