From 95c39fef460522ebc6f4a90202efe1d607a57ff2 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 6 May 2020 19:23:15 +0200
Subject: [PATCH 1/4] try with C:\Python37-x64\python

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 59dfe56..5e6fc06 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,9 @@ environment:
     - PYTHON_VER: C:\Python37\python
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       SETUP_COMPILER_FLAG:
+    - PYTHON_VER: C:\Python37-x64\python
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      SETUP_COMPILER_FLAG:
 
 
 version: '$(APP_VERSION).{build}'

From 92171834b640323192dc3380e5f21b4212c3fb8a Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 6 May 2020 19:31:41 +0200
Subject: [PATCH 2/4] select mingw32 or mingw64

---
 appveyor.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5e6fc06..4272da9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,15 +4,19 @@ environment:
     - PYTHON_VER: C:\Python27\python
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       SETUP_COMPILER_FLAG: --compiler=mingw32
+      ARCH_BITS: 32
     - PYTHON_VER: C:\Python35\python
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       SETUP_COMPILER_FLAG:
+      ARCH_BITS: 32
     - PYTHON_VER: C:\Python37\python
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       SETUP_COMPILER_FLAG:
+      ARCH_BITS: 32
     - PYTHON_VER: C:\Python37-x64\python
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       SETUP_COMPILER_FLAG:
+      ARCH_BITS: 64
 
 
 version: '$(APP_VERSION).{build}'
@@ -20,7 +24,7 @@ version: '$(APP_VERSION).{build}'
 image: Visual Studio 2017
 
 install:
-  - set PATH=%PATH%;C:\msys64\mingw32\bin
+  - set PATH=%PATH%;C:\msys64\mingw%ARCH_BITS%\bin
   # We need wheel installed to build wheels
   - "%PYTHON_VER%.exe -m pip install wheel"
 

From 5117e0cafc3ea8fac08c9b74dbb79240407f8bd2 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 6 May 2020 20:24:14 +0200
Subject: [PATCH 3/4] appveyor: arch_bits in .zip name

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4272da9..d0e2193 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,10 +35,10 @@ build_script:
   - mingw32-make -f Makefile.mingw pythonmodule PYTHON=%PYTHON_VER%
 
 after_build:
-  - 7z a -x!wingenminiupnpcstrings.exe ..\miniupnpc-%APPVEYOR_BUILD_VERSION%.zip *.exe *.dll *.a *.lib
+  - 7z a -x!wingenminiupnpcstrings.exe ..\miniupnpc_%ARCH_BITS%b-%APPVEYOR_BUILD_VERSION%.zip *.exe *.dll *.a *.lib
 
 artifacts:
-  - path: miniupnpc-$(appveyor_build_version).zip
+  - path: miniupnpc*-$(appveyor_build_version).zip
     name: miniupnpc binaries
   - path: miniupnpc/dist/miniupnpc-*.whl
     name: miniupnpc python wheel (self-contained)

From cfd5700d4dfec446a5ccf1d2d2d31eb9549a361f Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Wed, 6 May 2020 20:25:03 +0200
Subject: [PATCH 4/4] appveyor: python in path

---
 appveyor.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d0e2193..02c0199 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,19 +1,19 @@
 environment:
   APP_VERSION: '2.1'
   matrix:
-    - PYTHON_VER: C:\Python27\python
+    - PYTHON_VER: C:\Python27
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       SETUP_COMPILER_FLAG: --compiler=mingw32
       ARCH_BITS: 32
-    - PYTHON_VER: C:\Python35\python
+    - PYTHON_VER: C:\Python35
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       SETUP_COMPILER_FLAG:
       ARCH_BITS: 32
-    - PYTHON_VER: C:\Python37\python
+    - PYTHON_VER: C:\Python37
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       SETUP_COMPILER_FLAG:
       ARCH_BITS: 32
-    - PYTHON_VER: C:\Python37-x64\python
+    - PYTHON_VER: C:\Python37-x64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       SETUP_COMPILER_FLAG:
       ARCH_BITS: 64
@@ -24,15 +24,18 @@ version: '$(APP_VERSION).{build}'
 image: Visual Studio 2017
 
 install:
-  - set PATH=%PATH%;C:\msys64\mingw%ARCH_BITS%\bin
+  - set PATH=%PYTHON_VER%;%PYTHON_VER%\Scripts;%PATH%;C:\msys64\mingw%ARCH_BITS%\bin
   # We need wheel installed to build wheels
-  - "%PYTHON_VER%.exe -m pip install wheel"
+  - "%PYTHON_VER%\\python.exe -m pip install wheel"
+  - echo %PATH%
+  - cc -v
 
 build_script:
   - cd miniupnpc
   - appveyor AddCompilationMessage "Building miniupnpc"
   - mingw32-make -f Makefile.mingw
-  - mingw32-make -f Makefile.mingw pythonmodule PYTHON=%PYTHON_VER%
+  - appveyor AddCompilationMessage "Building python module"
+  - mingw32-make -f Makefile.mingw pythonmodule PYTHON=%PYTHON_VER%\python
 
 after_build:
   - 7z a -x!wingenminiupnpcstrings.exe ..\miniupnpc_%ARCH_BITS%b-%APPVEYOR_BUILD_VERSION%.zip *.exe *.dll *.a *.lib