[adonthell-commits] master 6d6239d 2/2: UPDATED windows build for latest msys2 (17/09/29)

[Kai Sterker]

branch: master
commit 6d6239de26a84ea1382af5c34154a965aa055c6d
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED windows build for latest msys2 (17/09/29)
---
 configure.ac        |  2 +-
 make_windows_pkg.sh | 37 ++++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3fe0cd..6de93fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,7 @@ AC_CHECK_FUNCS([TTF_GetFontKerningSizeGlyphs])
 dnl on a mingw build, we do not want SDL to redefine 'main'
 case "$target" in
   *-*-cygwin* | *-*-mingw32 | *-*-mingw64 )
-     SDL_CFLAGS=`echo $SDL_CFLAGS | sed 's/ -Dmain=SDL_main//'`
+     SDL_CFLAGS=`echo $SDL_CFLAGS | sed 's/-Dmain=SDL_main//'`
      SDL_DEFS="-DSDL_MAIN_HANDLED"
   ;;
 esac
diff --git a/make_windows_pkg.sh b/make_windows_pkg.sh
index aab8401..fd49a04 100755
--- a/make_windows_pkg.sh
+++ b/make_windows_pkg.sh
@@ -31,7 +31,7 @@ first=`echo ${appname:0:1} | tr 'a-z' 'A-Z'`
 bundle=$first${appname:1}
 bindir=$bundle/bin
 moduledir=$bundle/modules
-pythondir=$bundle/lib/python3.5
+pythondir=$bundle/lib/python3.6
 
 echo "Creating $bundle"
 
@@ -49,8 +49,8 @@ cd build
 # -- create resource file
 cat > adonthell.rc << EOF
 1 VERSIONINFO
-FILEVERSION     0,3,6,0
-PRODUCTVERSION  0,3,6,0
+FILEVERSION     0,3,7,0
+PRODUCTVERSION  0,3,7,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -58,12 +58,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "The Adonthell Team"
       VALUE "FileDescription", "Adonthell RPG Engine"
-      VALUE "FileVersion", "0.3.6"
+      VALUE "FileVersion", "0.3.7"
       VALUE "InternalName", "adonthell"
-      VALUE "LegalCopyright", "© 2016 The Adonthell Team"
+      VALUE "LegalCopyright", "© 2017 The Adonthell Team"
       VALUE "OriginalFilename", "adonthell-0.3.exe"
       VALUE "ProductName", "Adonthell"
-      VALUE "ProductVersion", "0.3.6"
+      VALUE "ProductVersion", "0.3.7"
     END
   END
 
@@ -78,7 +78,7 @@ windres adonthell.rc -O coff -o adonthell.res
 # -- prepare application
 prefix=${cwd}/${bundle}
 
-configure_args="--disable-unix-install --disable-pyc --prefix=$prefix 
--datadir=$prefix --mandir=/tmp"
+configure_args="--disable-unix-install --disable-pyc --prefix=$prefix 
--datadir=$prefix --mandir=/tmp 
--with-py-cflags='-I$MINGW_PREFIX/include/python3.6m'"
 linker_args="-L$MINGW_PREFIX/lib $cwd/build/adonthell.res -static-libgcc 
-static-libstdc++"
 
 echo "Configuring $appname. This may take a while ..."
@@ -140,7 +140,7 @@ done
 
 # -- copy required python modules from the standard library
 #
-# Note that this list is for Python 3.5.2 as provided by
+# Note that this list is for Python 3.6.2 as provided by
 # mingw64 and will have to be adjusted for other versions
 # of Python. 
 #
@@ -151,9 +151,9 @@ __future__.py
 _bootlocale.py
 _collections_abc.py
 _sitebuiltins.py
-_sysconfigdata.py
 _weakrefset.py
 abc.py
+bisect.py
 codecs.py
 collections/__init__.py
 collections/abc.py
@@ -176,13 +176,16 @@ importlib/util.py
 imp.py
 io.py
 keyword.py
-lib-dynload/_codecs_*-cpython-35m.dll
-lib-dynload/_md5-cpython-35m.dll
-lib-dynload/_random-cpython-35m.dll
-lib-dynload/_sha1-cpython-35m.dll
-lib-dynload/_sha256-cpython-35m.dll
-lib-dynload/_sha512-cpython-35m.dll
-lib-dynload/math-cpython-35m.dll
+lib-dynload/_blake2-cpython-36m.dll
+lib-dynload/_codecs_*-cpython-36m.dll
+lib-dynload/_md5-cpython-36m.dll
+lib-dynload/_random-cpython-36m.dll
+lib-dynload/_sha1-cpython-36m.dll
+lib-dynload/_sha256-cpython-36m.dll
+lib-dynload/_sha3-cpython-36m.dll
+lib-dynload/_sha512-cpython-36m.dll
+lib-dynload/_sysconfigdata_m_win32_.py
+lib-dynload/math-cpython-36m.dll
 linecache.py
 ntpath.py
 operator.py
@@ -211,5 +214,5 @@ for i in $py3_modules ; do
   if [ ! -d $pythondir/$target ] ; then
     mkdir $pythondir/$target
   fi
-  cp $MINGW_PREFIX/lib/python3.5/$i $pythondir/$target 
+  cp $MINGW_PREFIX/lib/python3.6/$i $pythondir/$target 
 done