diff options
author | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-05 23:39:25 (GMT) |
---|---|---|
committer | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-05 23:39:25 (GMT) |
commit | b773fa88eff6fba180498b2cef077947c00f13f4 (patch) | |
tree | 81d2e2c7764f76067d2b59fb6ee4f95789d28d67 | |
parent | 147dea314720e37f70e61aff48fe325e4ae475f2 (diff) |
Sadly, I edited all day long the file Makefile.mingw instead of
Makefile.mingw.in and lost all my work :/
Tryed there to get it back but it's not tested.
-rw-r--r-- | Makefile.mingw.in | 67 |
1 files changed, 27 insertions, 40 deletions
diff --git a/Makefile.mingw.in b/Makefile.mingw.in index 6f43494..bdf5f6f 100644 --- a/Makefile.mingw.in +++ b/Makefile.mingw.in @@ -12,78 +12,63 @@ GCOMPRIS_SRC = ./src/gcompris GCOMPRIS_BOARDS = ./src/boards GCOMPRIS_INSTALL_DIR = ./win32-install-dir -GTK_TOP := /gtk -GNUWIN32_TOP := /gnuwin32 -LIBXML2_TOP := /libxml2 -SDL_TOP := /sdl -CANVAS_TOP := /gnomecanvas -GNUCHESS_TOP := /gnuchess -PYTHON_DLL := /c/WINDOWS/system32/python24.dll -PYTHON_TOP := /c/Python24 -GNUCAP_TOP := /gnucap -SQLITE_TOP := /sqlite - -MAKENSIS := "/c/Program Files/NSIS/makensis.exe" +include global_win32.mak # These will be copied in the win32-install-dir ready to be packaged. NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC2.dll \ $(GNUCHESS_TOP)/bin/libreadline.dll \ - $(PYTHON_DLL) \ - $(GNUCAP_TOP)/src/MSW/gnucap.exe \ - $(GTK_TOP)/bin/gspawn-win32-helper.exe \ $(GNUCHESS_TOP)/bin/gnuchess.exe \ + $(FONTCONFIG_TOP)/bin/libfontconfig-1.dll \ + $(FREETYPE_TOP)/bin/freetype6.dll \ + $(GNUCAP_TOP)/src/MSW/gnucap.exe \ $(GNUWIN32_TOP)/bin/libintl-2.dll \ - $(GNUWIN32_TOP)/bin/libiconv-2.dll \ - $(CANVAS_TOP)/bin/libgnomecanvas-2-0.dll \ - $(SDL_TOP)/bin/SDL.dll \ - $(SDL_TOP)/bin/SDL_mixer.dll \ - $(LIBXML2_TOP)/bin/libxml2.dll \ - $(GTK_TOP)/bin/freetype6.dll \ + $(GTK_TOP)/bin/gspawn-win32-helper.exe \ $(GTK_TOP)/bin/intl.dll \ + $(GTK_TOP)/bin/jpeg62.dll \ + $(GTK_TOP)/bin/libatk-1.0-0.dll \ $(GTK_TOP)/bin/libcairo-2.dll \ - $(GTK_TOP)/bin/libpangocairo-1.0-0.dll \ - $(GTK_TOP)/bin/libart_lgpl_2-2.dll \ - $(GTK_TOP)/bin/freetype6.dll \ - $(GTK_TOP)/bin/libart_lgpl_2-2.dll \ + $(GTK_TOP)/bin/libexpat.dll \ $(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \ $(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \ $(GTK_TOP)/bin/libglib-2.0-0.dll \ $(GTK_TOP)/bin/libgmodule-2.0-0.dll \ $(GTK_TOP)/bin/libgobject-2.0-0.dll \ + $(GTK_TOP)/bin/libgthread-2.0-0.dll \ + $(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \ $(GTK_TOP)/bin/libpango-1.0-0.dll \ - $(GTK_TOP)/bin/libpangowin32-1.0-0.dll \ + $(GTK_TOP)/bin/libpangocairo-1.0-0.dll \ $(GTK_TOP)/bin/libpangoft2-1.0-0.dll \ - $(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \ - $(GTK_TOP)/bin/libatk-1.0-0.dll \ - $(GTK_TOP)/bin/libfontconfig-1.dll \ + $(GTK_TOP)/bin/libpangowin32-1.0-0.dll \ + $(GTK_TOP)/bin/libpng12-0.dll \ $(GTK_TOP)/bin/zlib1.dll \ - $(GTK_TOP)/bin/libgthread-2.0-0.dll \ - $(GTK_TOP)/expat/bin/xmlparse.dll \ - $(GTK_TOP)/expat/bin/xmltok.dll \ - $(GTK_TOP)/bin/iconv.dll \ - $(GTK_TOP)/bin/intl.dll \ - $(GTK_TOP)/bin/libpng13.dll \ - $(GTK_TOP)/bin/jpeg62.dll \ - $(SQLITE_TOP)/sqlite3.dll \ - /c/WINDOWS/system32/msvcr71.dll + $(ICONV_TOP)/bin/libiconv-2.dll \ + $(LIBXML2_TOP)/bin/libxml2.dll \ + $(MSVCR71_DLL) \ + $(SDL_TOP)/bin/SDL.dll \ + $(SDL_TOP)/bin/SDL_mixer.dll \ + $(SDL_TOP)/bin/libogg-0.dll \ + $(SDL_TOP)/bin/libvorbis-0.dll \ + $(SDL_TOP)/bin/libvorbisfile-3.dll \ + $(SQLITE_TOP)/sqlite3.dll NEEDED_FILES = README \ README.mingw \ COPYING \ - Changelog + ChangeLog ## ## all: cp config.h.mingw config.h + $(MAKE) -C ./src/libart_lgpl -f Makefile.mingw + $(MAKE) -C ./src/libgnomecanvas -f Makefile.mingw $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install: all mkdir -p $(GCOMPRIS_INSTALL_DIR)/share - $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install cp -r $(GCOMPRIS_BOARDS)/python $(GCOMPRIS_INSTALL_DIR)/share/gcompris rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/Makefile* @@ -121,6 +106,8 @@ installer: $(MAKENSIS) gcompris-installer.nsi clean: + $(MAKE) -C ./src/libart_lgpl -f Makefile.mingw clean + $(MAKE) -C ./src/libgnomecanvas -f Makefile.mingw clean $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean rm -rf config.h |