diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-11-12 11:12:15 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-11-12 11:12:15 (GMT) |
| commit | 5555979c9cbe700c42446d76835e515c9ba1ec2a (patch) | |
| tree | 8a6f9c17c8f6d5c336e703808969e7a903b5851e /Makefile.mingw.in | |
| parent | 0985b20beab740b5712d4e995aff898fac1887a5 (diff) | |
- Added support for sqlite compilation under windows
* Makefile.mingw.in:
* src/boards/Makefile.mingw:
* src/boards/python/melody.py: removed printout
* src/gcompris/Makefile.mingw:
* tools/py2exe/gcompris.py:
* src/boards/erase.c: (erase_create_item): fixed out of bounds image
Diffstat (limited to 'Makefile.mingw.in')
| -rw-r--r-- | Makefile.mingw.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.mingw.in b/Makefile.mingw.in index 5ee2f10..b3787fd 100644 --- a/Makefile.mingw.in +++ b/Makefile.mingw.in @@ -18,15 +18,17 @@ LIBXML2_TOP := /libxml2 SDL_TOP := /sdl CANVAS_TOP := /gnomecanvas GNUCHESS_TOP := /gnuchess -PYTHON_TOP := /c/WINDOWS/system32 +PYTHON_DLL := /c/WINDOWS/system32/python24.dll +PYTHON_TOP := /c/Python24 GNUCAP_TOP := /gnucap +SQLITE_TOP := /sqlite 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 \ - $(PYTHON_TOP)/python24.dll \ + $(PYTHON_DLL) \ $(GNUCAP_TOP)/src/MSW/gnucap.exe \ $(GTK_TOP)/bin/gspawn-win32-helper.exe \ $(GNUCHESS_TOP)/bin/gnuchess.exe \ @@ -62,7 +64,8 @@ NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC.dll \ $(GTK_TOP)/bin/iconv.dll \ $(GTK_TOP)/bin/intl.dll \ $(GTK_TOP)/bin/libpng13.dll \ - $(GTK_TOP)/bin/jpeg62.dll + $(GTK_TOP)/bin/jpeg62.dll \ + $(SQLITE_TOP)/sqlite3.dll NEEDED_FILES = README \ COPYING \ @@ -106,9 +109,13 @@ prepack: cp -r $(GTK_TOP)/lib/pango $(GCOMPRIS_INSTALL_DIR)/lib python: + cp $(PYTHON_TOP)/DLLs/tcl84.dll $(GCOMPRIS_INSTALL_DIR) + cp $(PYTHON_TOP)/DLLs/tk84.dll $(GCOMPRIS_INSTALL_DIR) cp tools/py2exe/gcompris.py $(GCOMPRIS_INSTALL_DIR) cp tools/py2exe/setup.py $(GCOMPRIS_INSTALL_DIR) - cd $(GCOMPRIS_INSTALL_DIR);/c/Python24/python.exe setup.py py2exe;cp dist/library.zip python24.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd .. + cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python24.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd .. + rm -f $(GCOMPRIS_INSTALL_DIR)/tcl84.dll + rm -f $(GCOMPRIS_INSTALL_DIR)/tk84.dll installer: $(MAKENSIS) gcompris-installer.nsi |