Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gcompris
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Archive
gcompris
Commits
ac4b1235
Commit
ac4b1235
authored
Sep 24, 2005
by
Bruno Coudoin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes to compile on windows again.
Hanoi_real is back to life Fixed several warnings
parent
57cd517e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
34 deletions
+37
-34
Makefile.mingw
Makefile.mingw
+1
-1
boards/hanoi_real.xml.in
boards/hanoi_real.xml.in
+1
-1
gcompris-installer.nsi
gcompris-installer.nsi
+1
-1
src/boards/Makefile.mingw
src/boards/Makefile.mingw
+1
-0
src/boards/hanoi_real.c
src/boards/hanoi_real.c
+2
-11
src/gcompris/Makefile.mingw
src/gcompris/Makefile.mingw
+21
-16
src/gcompris/board.c
src/gcompris/board.c
+2
-0
src/gcompris/gcompris.c
src/gcompris/gcompris.c
+3
-1
src/gcompris/profile.c
src/gcompris/profile.c
+5
-3
No files found.
Makefile.mingw
View file @
ac4b1235
...
...
@@ -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
\
$(G
NUCHESS
_TOP)
/bin/gspawn-win32-helper.exe
\
$(G
TK
_TOP)
/bin/gspawn-win32-helper.exe
\
$(GNUCHESS_TOP)
/bin/gnuchess.exe
\
$(GNUWIN32_TOP)
/bin/popt1.dll
\
$(GNUWIN32_TOP)
/bin/libintl-2.dll
\
...
...
boards/hanoi_real.xml.in
View file @
ac4b1235
...
...
@@ -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>
...
...
gcompris-installer.nsi
View file @
ac4b1235
...
...
@@ -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"
...
...
src/boards/Makefile.mingw
View file @
ac4b1235
...
...
@@ -119,6 +119,7 @@ BOARDS_C_SRC = \
fifteen.c
\
gletters.c
\
hanoi.c
\
hanoi_real.c
\
imageid.c
\
leftright.c
\
superbrain.c
\
...
...
src/boards/hanoi_real.c
View file @
ac4b1235
...
...
@@ -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
;
...
...
src/gcompris/Makefile.mingw
View file @
ac4b1235
...
...
@@ -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
...
...
src/gcompris/board.c
View file @
ac4b1235
...
...
@@ -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
();
...
...
src/gcompris/gcompris.c
View file @
ac4b1235
...
...
@@ -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
}
...
...
src/gcompris/profile.c
View file @
ac4b1235
/* gcompris - profile.c
*
* Time-stamp: <2005/0
8/26 17:05:13 yves
>
* Time-stamp: <2005/0
9/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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment