Commit e6d6a82f authored by Bruno Coudoin's avatar Bruno Coudoin

Fixed compilation chain to include everything needed to compile on windows

parent 74a8cfb7
......@@ -28,7 +28,7 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
README.mingw config.h.windows
README.mingw config.h.mingw Makefile.mingw global_win32.mak gcompris.ico gcompris-installer.nsi
distcore = $(PACKAGE)-core-$(VERSION)
......
......@@ -106,8 +106,17 @@ clean:
prep:
mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
cd boards ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
echo "WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib/locale
cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/lib/locale/
echo "Remove other .mo file not from gcompris"
find ./win32-install-dir/lib/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
\ No newline at end of file
@echo "-------------------------------------------------------------------------------"
@echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
@echo "-------------------------------------------------------------------------------"
mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/locale
cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/
@echo "Remove other .mo file not from gcompris"
find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
@echo "Grab installed assetml files"
cp -r /usr/local/share/assetml $(GCOMPRIS_INSTALL_DIR)/share/
@echo "Copy pixmap"
mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
@echo "Create the file gcompris-win-prepack.tar.gz
tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis
......@@ -255,5 +255,7 @@ libpython_la_SOURCES = python.c \
py-mod-anim.c py-mod-anim.h
EXTRA_DIST = README boards2static.pl
EXTRA_DIST = README boards2static.pl \
draw.c Makefile.mingw
......@@ -157,7 +157,9 @@ gcompris-marshal.c: gcompris-marshal.list $(GLIB_GENMARSHAL)
EXTRA_DIST = \
gcompris-marshal.list \
libgcompris-1.0.pc.in \
libgcompris-1.0-uninstalled.pc.in
libgcompris-1.0-uninstalled.pc.in \
Makefile.mingw gcomprisrc.rc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcompris-1.0.pc
......
/* gcompris - about.c
*
* Time-stamp: <2005/09/28 22:42:59 bruno>
* Time-stamp: <2005/10/05 00:57:09 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -306,7 +306,7 @@ void gcompris_about_start ()
"fill_color", "black",
NULL);
pixmap = gcompris_load_pixmap(sponsor_image);
pixmap = gcompris_load_pixmap("sponsor.png");
item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
"pixbuf", pixmap,
......
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