Commit 2deec883 authored by Bruno Coudoin's avatar Bruno Coudoin

Improved the windows port. The python / vcredist issue should be fine now.

parent bba5eb87
......@@ -58,10 +58,6 @@ activity_dir = advanced_colors-activity \
include global_win32.mak
MSVCR90_DLL = $(LOCAL_PREFIX)/msvcm90.dll \
$(LOCAL_PREFIX)/msvcp90.dll \
$(LOCAL_PREFIX)/msvcr90.dll
# 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 \
......@@ -104,6 +100,7 @@ NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC2.dll \
NEEDED_FILES = README \
README.mingw \
README.translators \
COPYING \
ChangeLog
......@@ -143,6 +140,7 @@ install: all Makefile.mingw
prepack: Makefile.mingw
mkdir -p $(GCOMPRIS_INSTALL_DIR)
cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR)
cp -r $(LOCAL_PREFIX)/Microsoft.VC90.CRT $(GCOMPRIS_INSTALL_DIR)
cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
cp -r $(GTK_TOP)/manifest $(GCOMPRIS_INSTALL_DIR)
......
......@@ -80,3 +80,44 @@ The GCompris package is created, double click on it from your file manager
to test it.
Additional Conditions for this Windows binary build
---------------------------------------------------
This program is linked with and uses Microsoft Distributable Code,
copyrighted by Microsoft Corporation. The Microsoft Distributable Code
includes the following files:
msvcr90.dll
msvcp90.dll
msvcm90.dll
If you further distribute programs that include the Microsoft
Distributable Code, you must comply with the restrictions on
distribution specified by Microsoft. In particular, you must require
distributors and external end users to agree to terms that protect the
Microsoft Distributable Code at least as much as Microsoft's own
requirements for the Distributable Code. See Microsoft's documentation
(included in its developer tools and on its website at microsoft.com)
for specific details.
Redistribution of the Windows binary build of the Python interpreter
complies with this agreement, provided that you do not:
- alter any copyright, trademark or patent notice in Microsoft's
Distributable Code;
- use Microsoft’s trademarks in your programs’ names or in a way that
suggests your programs come from or are endorsed by Microsoft;
- distribute Microsoft's Distributable Code to run on a platform other
than Microsoft operating systems, run-time technologies or application
platforms; or
- include Microsoft Distributable Code in malicious, deceptive or
unlawful programs.
These restrictions apply only to the Microsoft Distributable Code as
defined above, not to Python itself or any programs running on the
Python interpreter. The redistribution of the Python interpreter and
libraries is governed by the Python Software License included with this
file, or by other licenses as marked.
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