Commit ac4b1235 authored by Bruno Coudoin's avatar Bruno Coudoin

Fixes to compile on windows again.

Hanoi_real is back to life
Fixed several warnings
parent 57cd517e
......@@ -22,7 +22,7 @@ MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
# These will be copied in the win32-install-dir ready to be packaged.
NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC.dll \
$(GNUCHESS_TOP)/bin/libreadline.dll \
$(GNUCHESS_TOP)/bin/gspawn-win32-helper.exe \
$(GTK_TOP)/bin/gspawn-win32-helper.exe \
$(GNUCHESS_TOP)/bin/gnuchess.exe \
$(GNUWIN32_TOP)/bin/popt1.dll \
$(GNUWIN32_TOP)/bin/libintl-2.dll \
......
......@@ -5,7 +5,7 @@
type="hanoi_real"
section="/boards"
icon="boardicons/hanoi_real.png"
difficulty="0"
difficulty="3"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
boarddir="">
<_title>The Tower of Hanoi</_title>
......
......@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY
;The name var is set in .onInit
Name $name
!define GCOMPRIS_VERSION "6.5.3"
!define GCOMPRIS_VERSION "7.1.0"
OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
......
......@@ -119,6 +119,7 @@ BOARDS_C_SRC = \
fifteen.c \
gletters.c \
hanoi.c \
hanoi_real.c \
imageid.c \
leftright.c \
superbrain.c \
......
......@@ -68,14 +68,6 @@ static int number_of_item_y = 0;
static int item_width;
static int item_height;
/* Keep here the limit of the column */
static gint limit_column_x1[MAX_NUMBER_X];
static gint limit_column_x2[MAX_NUMBER_X];
static gint peg_disc_count[MAX_NUMBER_X];
static gint peg_top_disc[MAX_NUMBER_X];
/* Description of this plugin */
static BoardPlugin menu_bp =
{
......@@ -107,7 +99,7 @@ static BoardPlugin menu_bp =
*
*/
GET_BPLUGIN_INFO(hanoi)
GET_BPLUGIN_INFO(hanoi_real)
/*
* in : boolean TRUE = PAUSE : FALSE = CONTINUE
......@@ -256,7 +248,6 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent)
double gap_x, gap_y;
double baseline;
GnomeCanvasItem *item = NULL;
GnomeCanvasPathDef *path;
GdkPixbuf *pixmap = NULL;
gchar *filename;
......@@ -509,7 +500,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data)
case GDK_BUTTON_RELEASE:
if(dragging)
{
gint i,j;
gint i;
gint tmpi, tmpj;
double tmpx, tmpy;
PieceItem *piece_src;
......
......@@ -77,28 +77,33 @@ LIB_PATHS = -L$(GTK_TOP)/lib \
##
EXE_C_SRC = \
main.c \
gcompris.c \
gameutil.c \
properties.c \
about.c \
anim.c \
assetml.c \
bar.c \
file_selector.c \
images_selector.c \
help.c \
pixbuf_util.c \
board.c \
soundutil.c \
cursor.c \
board_config.c \
bonus.c \
timer.c \
score.c \
skin.c \
config.c \
about.c \
cursor.c \
file_selector.c \
gameutil.c \
gcompris.c \
gcompris_db.c \
gcompris_im.c \
gcompris_files.c \
help.c \
images_selector.c \
log.c \
main.c \
pixbuf_util.c \
profile.c \
properties.c \
score.c \
sdlplayer.c \
assetml.c \
anim.c
skin.c \
soundutil.c \
timer.c
RC_SRC = gcomprisrc.rc
......
......@@ -43,6 +43,7 @@ extern BoardPlugin * get_erase_bplugin_info();
extern BoardPlugin * get_fifteen_bplugin_info();
extern BoardPlugin * get_gletters_bplugin_info();
extern BoardPlugin * get_hanoi_bplugin_info();
extern BoardPlugin * get_hanoi_real_bplugin_info();
extern BoardPlugin * get_imageid_bplugin_info();
extern BoardPlugin * get_leftright_bplugin_info();
extern BoardPlugin * get_machpuzzle_bplugin_info();
......@@ -137,6 +138,7 @@ void init_plugins(void)
static_boards[i++] = get_erase_bplugin_info();
static_boards[i++] = get_gletters_bplugin_info();
static_boards[i++] = get_hanoi_bplugin_info();
static_boards[i++] = get_hanoi_real_bplugin_info();
static_boards[i++] = get_menu_bplugin_info();
static_boards[i++] = get_railroad_bplugin_info();
static_boards[i++] = get_reading_bplugin_info();
......
......@@ -24,6 +24,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
#include <string.h>
#include "gcompris.h"
#include "gcompris_config.h"
......@@ -321,7 +322,6 @@ static void init_background()
double xratio, yratio, max;
gint screen_height, screen_width;
GtkWidget *vbox;
int i;
screen_height = gdk_screen_height();
screen_width = gdk_screen_width();
......@@ -848,11 +848,13 @@ void gcompris_set_locale(gchar *locale)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#ifndef WIN32
/* Make change known. */
{
extern int _nl_msg_cat_cntr;
++_nl_msg_cat_cntr;
}
#endif
}
......
/* gcompris - profile.c
*
* Time-stamp: <2005/08/26 17:05:13 yves>
* Time-stamp: <2005/09/18 22:51:12 bruno>
*
* Copyright (C) 2005 Bruno Coudoin
*
......@@ -23,7 +23,8 @@
#include "gcompris.h"
#include "properties.h"
GcomprisProfile *gcompris_get_current_profile()
GcomprisProfile
*gcompris_get_current_profile()
{
GcomprisProperties *properties = gcompris_get_properties();
......@@ -37,7 +38,8 @@ GcomprisProfile *gcompris_get_current_profile()
}
void *gcompris_set_current_user(GcomprisUser *user)
void
*gcompris_set_current_user(GcomprisUser *user)
{
GcomprisProperties *properties = gcompris_get_properties();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment