Commit 78ee0ce4 authored by Bruno Coudoin's avatar Bruno Coudoin

Cleanup, popt is no more used

svn path=/trunk/; revision=2441
parent 3989bd68
2007-01-01 Bruno coudoin <bruno.coudoin@free.fr>
Removed dependancie on libpopt, use glib's GOption instead
* configure.in
* src/gcompris/gcompris.c
2006-12-21 Bruno coudoin <bruno.coudoin@free.fr>
* boards/sounds/scroll.wav: added from Tuxpaint
......
......@@ -59,7 +59,6 @@ urpmi libtool
urpmi libsqlite3_0 libsqlite3_0-devel
urpmi python-sqlite2
urpmi libxxf86vm1-devel
urpmi libpopt0-devel
WARNING
=======
......
......@@ -32,7 +32,6 @@ NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC.dll \
$(GNUCAP_TOP)/src/MSW/gnucap.exe \
$(GTK_TOP)/bin/gspawn-win32-helper.exe \
$(GNUCHESS_TOP)/bin/gnuchess.exe \
$(GNUWIN32_TOP)/bin/popt1.dll \
$(GNUWIN32_TOP)/bin/libintl-2.dll \
$(GNUWIN32_TOP)/bin/libiconv-2.dll \
$(CANVAS_TOP)/bin/libgnomecanvas-2-0.dll \
......
......@@ -47,9 +47,6 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */
/* Define to 1 if you have the `popt' library (-lpopt). */
#define HAVE_LIBPOPT 1
/* Define to 1 if you have the `SDL_mixer' library (-lSDL_mixer). */
#define HAVE_LIBSDL_MIXER 1
......
......@@ -69,10 +69,6 @@ LDFLAGS="-L$CROSS_DEV/lib $SDL_MIXER_LDFLAGS"
###########################################
# These libs do not use pkg-config !
# popt
CFLAGS="$CFLAGS -I$CROSS_DEV/popt/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/popt/lib"
# sqlite3
CFLAGS="$CFLAGS -I$CROSS_DEV/sqlite/include"
LDFLAGS="$LDFLAGS -L$CROSS_DEV/sqlite/lib"
......
......@@ -429,7 +429,6 @@ Section Uninstall
Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\pango.pyd"
Delete "$INSTDIR\pangocairo.pyd"
Delete "$INSTDIR\popt1.dll"
Delete "$INSTDIR\pthreadGC.dll"
Delete "$INSTDIR\python24.zip"
Delete "$INSTDIR\select.pyd"
......
......@@ -71,8 +71,7 @@ gcompris_LDADD = \
$(top_builddir)/src/gcompris/libgcompris-1.la \
$(LIBICONV) \
$(INTLLIBS) \
$(python_ldadd) \
$(LIBPOPT)
$(python_ldadd)
#
# Gcompris library
......
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