From d5d9228563cc7a1e1408100db323b10b733d47f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 10:48:28 +0100
Subject: [PATCH 01/44] test pacman

---
 .appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4b52492..026b551 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,8 +5,7 @@ configuration:
   - Release
 
 build_script:
-  - tree C:\msys64
-  - C:\msys64\bin\make
+  - pacman -Sy
 
 # Artifacts
 #artifacts:

From 4afa231c093f25c7881e829b69a30f47fc36a167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:08:07 +0100
Subject: [PATCH 02/44] test

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 026b551..606901f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,7 @@
 image: 'Visual Studio 2017'
 
+#test
+
 # Build configuration
 configuration:
   - Release

From 742f32dcc85cd1cea3516947db3b90f81d6d0a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:14:56 +0100
Subject: [PATCH 03/44] make in msys2

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 606901f..61c26d2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,13 +1,15 @@
 image: 'Visual Studio 2017'
 
-#test
-
 # Build configuration
 configuration:
   - Release
 
+install:
+  - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
+
 build_script:
-  - pacman -Sy
+  - C:\msys64\usr\bin\bash -lc "make"
+
 
 # Artifacts
 #artifacts:

From fb18504c95184ac20ad5212fa600ad001445cec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:16:10 +0100
Subject: [PATCH 04/44] no login shell

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 61c26d2..0384215 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,10 +5,10 @@ configuration:
   - Release
 
 install:
-  - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
+  - C:\msys64\usr\bin\bash -c "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "make"
+  - C:\msys64\usr\bin\bash -c "make"
 
 
 # Artifacts

From 38b76a92c5466aa1e44ac96060db7b56072d9650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:17:16 +0100
Subject: [PATCH 05/44] login shell

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 0384215..2d334bb 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,10 +5,10 @@ configuration:
   - Release
 
 install:
-  - C:\msys64\usr\bin\bash -c "pacman -S --noconfirm make"
+  - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -c "make"
+  - C:\msys64\usr\bin\bash -lc "pwd && ls && make"
 
 
 # Artifacts

From ee9f426970b215584949edbea41ba0d87acf5761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:21:12 +0100
Subject: [PATCH 06/44] cd

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2d334bb..2264d2a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,7 @@ install:
   - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "pwd && ls && make"
+  - C:\msys64\usr\bin\bash -lc "cd %APPVEYOR_BUILD_FOLDER && pwd && ls && make"
 
 
 # Artifacts

From ecab9e2b3e0bdc5c7a5d9b5e451cccb9da34f356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:22:54 +0100
Subject: [PATCH 07/44] env var

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2264d2a..1f1001a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,7 @@ install:
   - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "cd %APPVEYOR_BUILD_FOLDER && pwd && ls && make"
+  - C:\msys64\usr\bin\bash -lc "cd %APPVEYOR_BUILD_FOLDER% && pwd && ls && make"
 
 
 # Artifacts

From e9e2375f54fbea25b6c276d5f035791ca7985177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:23:30 +0100
Subject: [PATCH 08/44] env var

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1f1001a..2a9dc03 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,7 @@ install:
   - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "cd %APPVEYOR_BUILD_FOLDER% && pwd && ls && make"
+  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" && pwd && ls && make"
 
 
 # Artifacts

From 007666ed367a6f830307d9d09c9046742c6bb85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:28:07 +0100
Subject: [PATCH 09/44] ps test

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 2a9dc03..2242030 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,8 @@ install:
   - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" && pwd && ls && make"
+  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
+	powershell -Command \"echo powershell test\""
 
 
 # Artifacts

From f44036054c224fee200a8804f78bdb6751fdb155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:28:38 +0100
Subject: [PATCH 10/44] ps test fix

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2242030..d7d4230 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,7 @@ install:
 
 build_script:
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-	powershell -Command \"echo powershell test\""
+    powershell -Command \"echo powershell test\""
 
 
 # Artifacts

From d125847052c2ea793373ef48e8161a0b53f677b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:34:38 +0100
Subject: [PATCH 11/44] ls python

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

diff --git a/.appveyor.yml b/.appveyor.yml
index d7d4230..e595d0d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,10 +4,9 @@ image: 'Visual Studio 2017'
 configuration:
   - Release
 
-install:
-  - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm make"
-
 build_script:
+  - ls "C:\Python36-x64"
+  - ls "C:\Python36-x64\lib"
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     powershell -Command \"echo powershell test\""
 

From 7cec3ee00efdb2fbc07729c2869f53f762de726a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 13:35:45 +0100
Subject: [PATCH 12/44] ls python libs

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

diff --git a/.appveyor.yml b/.appveyor.yml
index e595d0d..2c7884d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,6 +7,7 @@ configuration:
 build_script:
   - ls "C:\Python36-x64"
   - ls "C:\Python36-x64\lib"
+  - ls "C:\Python36-x64\libs"
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     powershell -Command \"echo powershell test\""
 

From 6ad0f10c428c066bd2de0a7917e1ff5445e422b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 17:13:50 +0100
Subject: [PATCH 13/44] some windows stuff

---
 .appveyor.yml |  6 ++----
 Makefile      | 32 +++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2c7884d..3530366 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,11 +5,9 @@ configuration:
   - Release
 
 build_script:
-  - ls "C:\Python36-x64"
-  - ls "C:\Python36-x64\lib"
-  - ls "C:\Python36-x64\libs"
+  - call C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    powershell -Command \"echo powershell test\""
+    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 
 # Artifacts
diff --git a/Makefile b/Makefile
index 986211c..026c380 100644
--- a/Makefile
+++ b/Makefile
@@ -17,20 +17,32 @@ ifeq ($(filter ${PLATFORM},${PLATFORMS_SUPPORTED}),)
   ${error Platform not detected or unsupported.}
 endif
 
+PKG_FILES=pyside relocate.sh env.sh
+
+ifeq (${PYTHON_WINDOWS},)
 PYTHON_SRC_FILE=Python-3.6.4.tar.xz
 PYTHON_SRC_MD5=1325134dd525b4a2c3272a1a0214dd54
 PYTHON_SRC_URL=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz
 PYTHON_SRC_DIR=Python-3.6.4
+PYTHON_DEPS=python
+PKG_FILES+=python
 ifeq (${PLATFORM},macos)
   PYTHON_FRAMEWORK=${ROOT_DIR}/python/Python.framework
   PYTHON_PREFIX=${PYTHON_FRAMEWORK}/Versions/Current
 else
-  PYTHON_PREFIX=${ROOT_DIR}/python
+  PYTHON_PREFIX:=${ROOT_DIR}/python
 endif
 ${PYTHON_SRC_DIR}_target=PYTHON_SRC
 PYTHON_LIBRARY=${PYTHON_PREFIX}/lib/libpython3.so
 PYTHON_INCLUDE_DIR=${PYTHON_PREFIX}/include/python3.6m
 PYTHON_EXECUTABLE=${PYTHON_PREFIX}/bin/python3
+else
+PYTHON_PREFIX=${PYTHON_WINDOWS}
+PYTHON_LIBRARY=${PYTHON_WINDOWS}/libs/python3.lib
+PYTHON_INCLUDE_DIR=${PYTHON_WINDOWS}/include
+PYTHON_EXECUTABLE=${PYTHON_WINDOWS}/python.exe
+PYTHON_DEPS=
+endif
 
 
 PATCHELF_SRC_FILE=patchelf-0.9.tar.bz2
@@ -44,6 +56,7 @@ ${PATCHELF_SRC_DIR}_target=PATCHELF_SRC
 #QT_SRC_MD5=6a37466c8c40e87d4a19c3f286ec2542
 #QT_SRC_URL=https://download.qt.io/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz
 
+ifeq (${QT_PREFIX},)
 QT_BIN_FILE=cutter-deps-qt.tar.gz
 QT_BIN_URL=https://github.com/radareorg/cutter-deps-qt/releases/download/v7/cutter-deps-qt-${PLATFORM}.tar.gz
 QT_BIN_MD5_linux=c262bc39d9d07c75c6e8c42147e46760
@@ -53,6 +66,13 @@ QT_BIN_MD5=${QT_BIN_MD5_${PLATFORM}}
 QT_BIN_DIR=qt
 QT_PREFIX:=${ROOT_DIR}/${QT_BIN_DIR}
 ${QT_BIN_DIR}_target=QT_BIN
+QT_DEPS=qt
+PKG_FILES+=qt
+QT_OPENGL_ENABLED=0
+else
+QT_OPENGL_ENABLED:=1
+QT_DEPS=
+endif
 
 PYSIDE_SRC_FILE=pyside-setup-everywhere-src-5.12.1.tar.xz
 PYSIDE_SRC_MD5=c247fc1de38929d81aedd1c93d629d9e
@@ -87,7 +107,7 @@ else#
   PATCHELF_TARGET_DISTCLEAN=
 endif
 
-all: python qt pyside relocate.sh pkg
+all: ${PYTHON_DEPS} ${QT_DEPS} pyside relocate.sh pkg
 
 .PHONY: clean
 clean: clean-python clean-qt clean-pyside clean-relocate.sh clean-env.sh ${PATCHELF_TARGET_CLEAN}
@@ -240,11 +260,13 @@ ${PYSIDE_SRC_DIR}:
 	# Patch to prevent complete overriding of LD_LIBRARY_PATH
 	#patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside2-PySideModules.cmake.patch
 
+ifeq(${QT_OPENGL_ENABLED},1)
 	# Patches to remove OpenGL-related source files.
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtGui/CMakeLists.txt" patch/pyside-5.12.1/QtGui-CMakeLists.txt.patch
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt" patch/pyside-5.12.1/QtWidgets-CMakeLists.txt.patch
+endif
 
-pyside: python qt ${PYSIDE_SRC_DIR}
+pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 	@echo ""
 	@echo "#########################"
 	@echo "# Building Shiboken2    #"
@@ -326,8 +348,8 @@ clean-env.sh:
 
 # Package
 
-${PACKAGE_FILE}: python qt pyside relocate.sh env.sh
-	tar -czf "${PACKAGE_FILE}" qt python pyside relocate.sh env.sh
+${PACKAGE_FILE}: ${PKG_FILES}
+	tar -czf "${PACKAGE_FILE}" ${PKG_FILES}
 
 .PHONY: pkg
 pkg: ${PACKAGE_FILE}

From df49466573299b7bd1d26aba78b7a1338738bf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 17:41:41 +0100
Subject: [PATCH 14/44] space

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 3530366..d5f1336 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@ configuration:
   - Release
 
 build_script:
-  - call C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat x64
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 

From ec31ace4cc9593cf36acb04253548cf57020ad48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Mon, 11 Mar 2019 17:42:38 +0100
Subject: [PATCH 15/44] Makefile syntax fix

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 026c380..87a8439 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,7 @@ ${PYSIDE_SRC_DIR}:
 	# Patch to prevent complete overriding of LD_LIBRARY_PATH
 	#patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside2-PySideModules.cmake.patch
 
-ifeq(${QT_OPENGL_ENABLED},1)
+ifeq (${QT_OPENGL_ENABLED},1)
 	# Patches to remove OpenGL-related source files.
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtGui/CMakeLists.txt" patch/pyside-5.12.1/QtGui-CMakeLists.txt.patch
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt" patch/pyside-5.12.1/QtWidgets-CMakeLists.txt.patch

From 60f6775aa96d0af9d61e51d4b26acbafbe2d9d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Tue, 12 Mar 2019 13:08:16 +0100
Subject: [PATCH 16/44] path test

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

diff --git a/.appveyor.yml b/.appveyor.yml
index d5f1336..7ad8dce 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,8 +5,10 @@ configuration:
   - Release
 
 build_script:
+  - echo %PATH%
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
+  - echo %PATH%
+  - C:\msys64\usr\bin\bash -lc "echo $PATH && echo -------- && cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 

From 445b218240ce621f8229a68dbd745f09babf8bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Tue, 12 Mar 2019 13:10:22 +0100
Subject: [PATCH 17/44] llvm test

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 7ad8dce..7b10609 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,10 +5,11 @@ configuration:
   - Release
 
 build_script:
-  - echo %PATH%
+  - llvm-config --prefix
+  - llvm-config --version
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - echo %PATH%
-  - C:\msys64\usr\bin\bash -lc "echo $PATH && echo -------- && cd \"%APPVEYOR_BUILD_FOLDER%\" &&
+  - llvm-config --prefix
+  - C:\msys64\usr\bin\bash -lc "llvm-config --version && echo -------- && cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 

From 343022fb67fb2b5d9089d7763f8d8ac15a15ad62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Tue, 12 Mar 2019 13:11:45 +0100
Subject: [PATCH 18/44] ls llvm

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 7b10609..17dc2c1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,6 +5,7 @@ configuration:
   - Release
 
 build_script:
+  - ls C:\Program Files\LLVM\bin
   - llvm-config --prefix
   - llvm-config --version
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64

From f4a1594c03a3d097f41e8c066d2061a3f8311a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Tue, 12 Mar 2019 13:12:27 +0100
Subject: [PATCH 19/44] fix ls

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 17dc2c1..bca6298 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@ configuration:
   - Release
 
 build_script:
-  - ls C:\Program Files\LLVM\bin
+  - ls "C:\Program Files\LLVM\bin"
   - llvm-config --prefix
   - llvm-config --version
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64

From 8400fa595d5992ce9a468b2611f0c227fa9e2e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Tue, 12 Mar 2019 13:15:10 +0100
Subject: [PATCH 20/44] ls llvm

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index bca6298..74a3861 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@ configuration:
   - Release
 
 build_script:
-  - ls "C:\Program Files\LLVM\bin"
+  - ls "C:\Program Files\LLVM"
   - llvm-config --prefix
   - llvm-config --version
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64

From b524a013ca81d5d84abb24cda7fe077489a545e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 12 Mar 2019 20:23:52 +0100
Subject: [PATCH 21/44] LLVM_INSTALL_DIR

---
 .appveyor.yml |  8 ++------
 Makefile      | 11 +++++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 74a3861..4c47e0f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,13 +5,9 @@ configuration:
   - Release
 
 build_script:
-  - ls "C:\Program Files\LLVM"
-  - llvm-config --prefix
-  - llvm-config --version
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - llvm-config --prefix
-  - C:\msys64\usr\bin\bash -lc "llvm-config --version && echo -------- && cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
+  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
+    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" LLVM_PREFIX=\"C:\Program Files\LLVM\""
 
 
 # Artifacts
diff --git a/Makefile b/Makefile
index 87a8439..598bf55 100644
--- a/Makefile
+++ b/Makefile
@@ -87,14 +87,14 @@ PACKAGE_FILE=cutter-deps-${PLATFORM}.tar.gz
 
 BUILD_THREADS=4
 
-LLVM_LIBDIR=$(shell llvm-config --libdir)
-
 ifeq (${PLATFORM},linux)
+  LLVM_LIBDIR=$(shell llvm-config --libdir)
   export LD_LIBRARY_PATH := ${PYTHON_PREFIX}/lib:${QT_PREFIX}/lib:${LLVM_LIBDIR}:${LD_LIBRARY_PATH}
 endif
 ifeq (${PLATFORM},macos)
- export DYLD_LIBRARY_PATH := ${PYTHON_PREFIX}/lib:${QT_PREFIX}/lib:${LLVM_LIBDIR}:${DYLD_LIBRARY_PATH}
- export DYLD_FRAMEWORK_PATH := ${PYTHON_PREFIX}/lib:${QT_PREFIX}/lib:${LLVM_LIBDIR}:${DYLD_FRAMEWORK_PATH}
+  LLVM_LIBDIR=$(shell llvm-config --libdir)
+  export DYLD_LIBRARY_PATH := ${PYTHON_PREFIX}/lib:${QT_PREFIX}/lib:${LLVM_LIBDIR}:${DYLD_LIBRARY_PATH}
+  export DYLD_FRAMEWORK_PATH := ${PYTHON_PREFIX}/lib:${QT_PREFIX}/lib:${LLVM_LIBDIR}:${DYLD_FRAMEWORK_PATH}
 endif
 
 ifeq (${PLATFORM},linux)
@@ -283,6 +283,9 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DPYTHON_LIBRARY="${PYTHON_LIBRARY}" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
+ifneq (${LLVM_PREFIX},)
+		-DLLVM_INSTALL_DIR="${LLVM_PREFIX}" \
+endif
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
 		../../sources/shiboken2

From 46373ed8445d6b3a45f3b7145d297d46589d24e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 12 Mar 2019 20:27:39 +0100
Subject: [PATCH 22/44] LLVM_INSTALL_DIR fix

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 598bf55..ecfcdd2 100644
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,12 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 
 	echo "${LD_LIBRARY_PATH}"
 
+ifneq (${LLVM_PREFIX},)
+	LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
+else
+	LLVM_CMAKE_ARG=
+endif
+
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \
@@ -283,9 +289,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DPYTHON_LIBRARY="${PYTHON_LIBRARY}" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
-ifneq (${LLVM_PREFIX},)
-		-DLLVM_INSTALL_DIR="${LLVM_PREFIX}" \
-endif
+		${LLVM_CMAKE_ARG} \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
 		../../sources/shiboken2
@@ -310,6 +314,7 @@ endif
 		-DPYTHON_LIBRARY="${PYTHON_LIBRARY}" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
+		${LLVM_CMAKE_ARG} \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_CXX_FLAGS=-w \
 		-DCMAKE_BUILD_TYPE=Release \

From dc93a868e7cc4c41959c7dbace41b6715b63534b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 12 Mar 2019 20:30:29 +0100
Subject: [PATCH 23/44] LLVM_INSTALL_DIR fix2

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ecfcdd2..26f3fb1 100644
--- a/Makefile
+++ b/Makefile
@@ -276,9 +276,9 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 	echo "${LD_LIBRARY_PATH}"
 
 ifneq (${LLVM_PREFIX},)
-	LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
+  LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
 else
-	LLVM_CMAKE_ARG=
+  LLVM_CMAKE_ARG=
 endif
 
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"

From 7065470e9cf385e4997cab37ee34e3a5c3e8edd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 12 Mar 2019 20:32:38 +0100
Subject: [PATCH 24/44] LLVM_INSTALL_DIR fix3

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 26f3fb1..3873ca8 100644
--- a/Makefile
+++ b/Makefile
@@ -241,6 +241,13 @@ distclean-qt: clean-qt
 
 # Shiboken2 + PySide2
 
+ifneq (${LLVM_PREFIX},)
+  LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
+else
+  LLVM_CMAKE_ARG=
+endif
+
+
 ${PYSIDE_SRC_DIR}:
 	@echo ""
 	@echo "#########################"
@@ -275,12 +282,6 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 
 	echo "${LD_LIBRARY_PATH}"
 
-ifneq (${LLVM_PREFIX},)
-  LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
-else
-  LLVM_CMAKE_ARG=
-endif
-
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \

From b63f5488bd5e090759b1ac006fe97c800cb20aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 12 Mar 2019 21:05:53 +0100
Subject: [PATCH 25/44] env lol

---
 .appveyor.yml |  2 +-
 Makefile      | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4c47e0f..aac65c4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ configuration:
 build_script:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" LLVM_PREFIX=\"C:\Program Files\LLVM\""
+    LLVM_PREFIX=\"C:\Program Files\LLVM\" make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 
 # Artifacts
diff --git a/Makefile b/Makefile
index 3873ca8..8d4a425 100644
--- a/Makefile
+++ b/Makefile
@@ -241,13 +241,6 @@ distclean-qt: clean-qt
 
 # Shiboken2 + PySide2
 
-ifneq (${LLVM_PREFIX},)
-  LLVM_CMAKE_ARG=-DLLVM_INSTALL_DIR="${LLVM_PREFIX}"
-else
-  LLVM_CMAKE_ARG=
-endif
-
-
 ${PYSIDE_SRC_DIR}:
 	@echo ""
 	@echo "#########################"
@@ -280,8 +273,6 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 	@echo "#########################"
 	@echo ""
 
-	echo "${LD_LIBRARY_PATH}"
-
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \
@@ -290,7 +281,6 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DPYTHON_LIBRARY="${PYTHON_LIBRARY}" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
-		${LLVM_CMAKE_ARG} \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
 		../../sources/shiboken2
@@ -315,7 +305,6 @@ endif
 		-DPYTHON_LIBRARY="${PYTHON_LIBRARY}" \
 		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR}" \
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
-		${LLVM_CMAKE_ARG} \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_CXX_FLAGS=-w \
 		-DCMAKE_BUILD_TYPE=Release \

From 00f4d0f97ebeebd44665b05c852dbd38e6e9bd15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 09:58:00 +0100
Subject: [PATCH 26/44] echo llvm dir

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 8d4a425..e828a54 100644
--- a/Makefile
+++ b/Makefile
@@ -273,6 +273,8 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 	@echo "#########################"
 	@echo ""
 
+	echo "$$LLVM_INSTALL_DIR"
+
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \

From 35be759ba4c4db20f4f231e3515c81f4c4b09715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 10:04:57 +0100
Subject: [PATCH 27/44] fix llvm dir

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index aac65c4..8d9e52d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ configuration:
 build_script:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    LLVM_PREFIX=\"C:\Program Files\LLVM\" make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
+    LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 
 # Artifacts

From 3f607c2e835b94fe77861afe3cb170a02401d133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 10:14:36 +0100
Subject: [PATCH 28/44] use nmake

---
 Makefile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Makefile b/Makefile
index e828a54..39debb6 100644
--- a/Makefile
+++ b/Makefile
@@ -241,6 +241,12 @@ distclean-qt: clean-qt
 
 # Shiboken2 + PySide2
 
+ifeq (${PLATFORM},win)
+CMAKE_GENERATOR=NMake Makefiles
+else
+CMAKE_GENERATOR=Unix Makefiles
+endif
+
 ${PYSIDE_SRC_DIR}:
 	@echo ""
 	@echo "#########################"
@@ -277,6 +283,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
+		-G "${CMAKE_GENERATOR}" \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \
 		-DCMAKE_INSTALL_PREFIX="${PYSIDE_PREFIX}" \
 		-DUSE_PYTHON_VERSION=3 \
@@ -286,8 +293,14 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
 		../../sources/shiboken2
+
+ifeq (${PLATFORM},win)
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && nmake
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && nmake install
+else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" install > /dev/null
+endif
 
 ifeq (${PLATFORM},macos)
 	install_name_tool -add_rpath @executable_path/../../qt/lib "${PYSIDE_PREFIX}/bin/shiboken2"
@@ -301,6 +314,7 @@ endif
 
 	mkdir -p "${PYSIDE_SRC_DIR}/build/pyside2"
 	cd "${PYSIDE_SRC_DIR}/build/pyside2" && cmake \
+		-G "${CMAKE_GENERATOR}" \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX};${PYSIDE_PREFIX}" \
 		-DCMAKE_INSTALL_PREFIX="${PYSIDE_PREFIX}" \
 		-DUSE_PYTHON_VERSION=3 \
@@ -312,8 +326,14 @@ endif
 		-DCMAKE_BUILD_TYPE=Release \
 		-DMODULES="Core;Gui;Widgets" \
 		../../sources/pyside2
+
+ifeq (${PLATFORM},win)
+	cd "${PYSIDE_SRC_DIR}/build/pyside2" && nmake
+	cd "${PYSIDE_SRC_DIR}/build/pyside2" && nmake install
+else
 	make -C "${PYSIDE_SRC_DIR}/build/pyside2" -j${BUILD_THREADS}
 	make -C "${PYSIDE_SRC_DIR}/build/pyside2" install
+endif
 
 .PHONY: clean-pyside
 clean-pyside:

From 71cd97247be279b0c5da1a7170fba8ead688af80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:02:31 +0100
Subject: [PATCH 29/44] try ninja

---
 .appveyor.yml |  5 ++++-
 Makefile      | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 8d9e52d..7e8ddf2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,11 @@ configuration:
 
 build_script:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && unzip ninja-win.zip"
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
+    export PATH=\"$PWD/ninja:$PATH\" &&
+    export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
+    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
 
 # Artifacts
diff --git a/Makefile b/Makefile
index 39debb6..be14cf4 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,7 @@ distclean-qt: clean-qt
 # Shiboken2 + PySide2
 
 ifeq (${PLATFORM},win)
-CMAKE_GENERATOR=NMake Makefiles
+CMAKE_GENERATOR=Ninja
 else
 CMAKE_GENERATOR=Unix Makefiles
 endif
@@ -295,8 +295,8 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && nmake
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && nmake install
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" install > /dev/null
@@ -328,8 +328,8 @@ endif
 		../../sources/pyside2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/pyside2" && nmake
-	cd "${PYSIDE_SRC_DIR}/build/pyside2" && nmake install
+	cd "${PYSIDE_SRC_DIR}/build/pyside2" && ninja
+	cd "${PYSIDE_SRC_DIR}/build/pyside2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/pyside2" -j${BUILD_THREADS}
 	make -C "${PYSIDE_SRC_DIR}/build/pyside2" install

From 324b5143497ccb8e0b148b087e7e0522dcebdddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:03:36 +0100
Subject: [PATCH 30/44] try ninja

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7e8ddf2..c209a35 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,7 +6,7 @@ configuration:
 
 build_script:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && unzip ninja-win.zip"
+  - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && 7z x ninja-win.zip"
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&

From d594eebe4caab81217b9063ccdc0be32589c8484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:07:29 +0100
Subject: [PATCH 31/44] order

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index c209a35..a212395 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,8 +5,8 @@ configuration:
   - Release
 
 build_script:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && 7z x ninja-win.zip"
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&

From 5370fcbe4b24143deb1e0b6631ce11cae609ab74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:11:44 +0100
Subject: [PATCH 32/44] order

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index be14cf4..678fe9e 100644
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,8 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
 		-G "${CMAKE_GENERATOR}" \
+		-DCMAKE_CXX_COMPILER=cl \
+		-DCMAKE_C_COMPILER=cl \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \
 		-DCMAKE_INSTALL_PREFIX="${PYSIDE_PREFIX}" \
 		-DUSE_PYTHON_VERSION=3 \

From 7789cda120b753c9511249abd681991c00ba39e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:18:40 +0100
Subject: [PATCH 33/44] python36

---
 Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 678fe9e..f933015 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ PYTHON_INCLUDE_DIR=${PYTHON_PREFIX}/include/python3.6m
 PYTHON_EXECUTABLE=${PYTHON_PREFIX}/bin/python3
 else
 PYTHON_PREFIX=${PYTHON_WINDOWS}
-PYTHON_LIBRARY=${PYTHON_WINDOWS}/libs/python3.lib
+PYTHON_LIBRARY=${PYTHON_WINDOWS}/libs/python36.lib
 PYTHON_INCLUDE_DIR=${PYTHON_WINDOWS}/include
 PYTHON_EXECUTABLE=${PYTHON_WINDOWS}/python.exe
 PYTHON_DEPS=
@@ -242,9 +242,9 @@ distclean-qt: clean-qt
 # Shiboken2 + PySide2
 
 ifeq (${PLATFORM},win)
-CMAKE_GENERATOR=Ninja
+PLATFORM_CMAKE_ARGS=-G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
 else
-CMAKE_GENERATOR=Unix Makefiles
+PLATFORM_CMAKE_ARGS=
 endif
 
 ${PYSIDE_SRC_DIR}:
@@ -283,9 +283,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 
 	mkdir -p "${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && cmake \
-		-G "${CMAKE_GENERATOR}" \
-		-DCMAKE_CXX_COMPILER=cl \
-		-DCMAKE_C_COMPILER=cl \
+		${PLATFORM_CMAKE_ARGS} \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX}" \
 		-DCMAKE_INSTALL_PREFIX="${PYSIDE_PREFIX}" \
 		-DUSE_PYTHON_VERSION=3 \
@@ -316,7 +314,7 @@ endif
 
 	mkdir -p "${PYSIDE_SRC_DIR}/build/pyside2"
 	cd "${PYSIDE_SRC_DIR}/build/pyside2" && cmake \
-		-G "${CMAKE_GENERATOR}" \
+		${PLATFORM_CMAKE_ARGS} \
 		-DCMAKE_PREFIX_PATH="${QT_PREFIX};${PYSIDE_PREFIX}" \
 		-DCMAKE_INSTALL_PREFIX="${PYSIDE_PREFIX}" \
 		-DUSE_PYTHON_VERSION=3 \

From 1863e23752a40291584f9592fc5b6caba7bca930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:30:39 +0100
Subject: [PATCH 34/44] generator debug

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f933015..1b272b1 100644
--- a/Makefile
+++ b/Makefile
@@ -292,10 +292,11 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DGENERATOR_EXTRA_FLAGS="--debug-level=full" \
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja || "${PYSIDE_SRC_DIR}/build/shiboken2/generator/shiboken2.exe --version"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null

From 7213d19423ff735d76cc3425d28e19b4e752987e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:36:09 +0100
Subject: [PATCH 35/44] generator debug2

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1b272b1..962dc46 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja || "${PYSIDE_SRC_DIR}/build/shiboken2/generator/shiboken2.exe --version"
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "tree ${PYSIDE_SRC_DIR}/build/shiboken2"
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null

From 1fc5383cfda803cb55d317570c287b8623c3caf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:41:39 +0100
Subject: [PATCH 36/44] generator debug3

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 962dc46..cc81086 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "tree ${PYSIDE_SRC_DIR}/build/shiboken2"
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "tree ."
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null

From 7c8692f266c755a266b17ca234ef9682d11db4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 11:47:37 +0100
Subject: [PATCH 37/44] generator debug4

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cc81086..d4859f7 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "tree ."
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "find ."
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null

From 708f734609d4edc25bccc04f7dd7eb6902394b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 12:35:04 +0100
Subject: [PATCH 38/44] facepalm

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d4859f7..1a192dd 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || "find ."
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || find .; generator/shiboken2.exe --version
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null

From 0bb853879d8ae6c7131c14bb9f22774e2c622fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 12:39:56 +0100
Subject: [PATCH 39/44] qt in path

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a212395..1a15e34 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,7 @@ build_script:
   - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && 7z x ninja-win.zip"
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
-    export PATH=\"$PWD/ninja:$PATH\" &&
+    export PATH=\"$PWD/ninja:/c/Qt/5.12.1/msvc2017_64/bin:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 

From 5f424d62559fca868254d202cd88a87fd939d31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 13:03:32 +0100
Subject: [PATCH 40/44] disable gl

---
 .appveyor.yml | 2 +-
 Makefile      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1a15e34..01f5891 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,7 +10,7 @@ build_script:
   - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:/c/Qt/5.12.1/msvc2017_64/bin:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
-    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
+    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" QT_OPENGL_ENABLED=0"
 
 
 # Artifacts
diff --git a/Makefile b/Makefile
index 1a192dd..a04aaaa 100644
--- a/Makefile
+++ b/Makefile
@@ -292,11 +292,10 @@ pyside: ${PYTHON_DEPS} ${QT_DEPS} ${PYSIDE_SRC_DIR}
 		-DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" \
 		-DBUILD_TESTS=OFF \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DGENERATOR_EXTRA_FLAGS="--debug-level=full" \
 		../../sources/shiboken2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j 1 || find .; generator/shiboken2.exe --version
+	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja -j ${BUILD_THREADS}
 	cd "${PYSIDE_SRC_DIR}/build/shiboken2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/shiboken2" -j${BUILD_THREADS} > /dev/null
@@ -329,7 +328,7 @@ endif
 		../../sources/pyside2
 
 ifeq (${PLATFORM},win)
-	cd "${PYSIDE_SRC_DIR}/build/pyside2" && ninja
+	cd "${PYSIDE_SRC_DIR}/build/pyside2" && ninja -j ${BUILD_THREADS}
 	cd "${PYSIDE_SRC_DIR}/build/pyside2" && ninja install
 else
 	make -C "${PYSIDE_SRC_DIR}/build/pyside2" -j${BUILD_THREADS}

From db9a8816d598feb851d5a44c5f245349320859c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 13:56:52 +0100
Subject: [PATCH 41/44] some restructuring

---
 .appveyor.yml | 24 +++++-------------------
 Makefile      |  4 ++--
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 01f5891..461412d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,30 +1,16 @@
 image: 'Visual Studio 2017'
 
-# Build configuration
 configuration:
   - Release
 
 build_script:
-  - C:\msys64\usr\bin\bash -lc "mkdir ninja && cd ninja && wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip && 7z x ninja-win.zip"
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-  - C:\msys64\usr\bin\bash -lc "cd \"%APPVEYOR_BUILD_FOLDER%\" &&
+  - C:\msys64\usr\bin\bash -lc "
+    mkdir ninja &&
+    cd ninja &&
+    wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip &&
+    7z x ninja-win.zipcd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:/c/Qt/5.12.1/msvc2017_64/bin:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" QT_OPENGL_ENABLED=0"
 
-
-# Artifacts
-#artifacts:
-#  - path: "cutter-deps-windows.zip"
-#
-#deploy:
-#  description: 'cutter-deps'
-#  provider: GitHub
-#  auth_token:
-#    secure: 
-#  artifact: "%ARTIFACT_NAME%"
-#  draft: false
-#  prerelease: true
-#  on:
-#    appveyor_repo_tag: true
-#
diff --git a/Makefile b/Makefile
index a04aaaa..88c038b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifeq ($(filter ${PLATFORM},${PLATFORMS_SUPPORTED}),)
   ${error Platform not detected or unsupported.}
 endif
 
-PKG_FILES=pyside relocate.sh env.sh
+PKG_FILES=pyside
 
 ifeq (${PYTHON_WINDOWS},)
 PYTHON_SRC_FILE=Python-3.6.4.tar.xz
@@ -107,7 +107,7 @@ else#
   PATCHELF_TARGET_DISTCLEAN=
 endif
 
-all: ${PYTHON_DEPS} ${QT_DEPS} pyside relocate.sh pkg
+all: pkg 
 
 .PHONY: clean
 clean: clean-python clean-qt clean-pyside clean-relocate.sh clean-env.sh ${PATCHELF_TARGET_CLEAN}

From 4d6c5ff1052da56817f1cf5620583a2a15dd3462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 13:59:28 +0100
Subject: [PATCH 42/44] syntax fix

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

diff --git a/.appveyor.yml b/.appveyor.yml
index 461412d..e190d23 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,7 +9,8 @@ build_script:
     mkdir ninja &&
     cd ninja &&
     wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip &&
-    7z x ninja-win.zipcd \"%APPVEYOR_BUILD_FOLDER%\" &&
+    7z x ninja-win.zip &&
+    cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:/c/Qt/5.12.1/msvc2017_64/bin:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" QT_OPENGL_ENABLED=0"

From 65ea85868c5db467003a2dc587a4d44ba76c6266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 14:44:04 +0100
Subject: [PATCH 43/44] gl fix

---
 .appveyor.yml | 2 +-
 Makefile      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e190d23..a4f3451 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,5 +13,5 @@ build_script:
     cd \"%APPVEYOR_BUILD_FOLDER%\" &&
     export PATH=\"$PWD/ninja:/c/Qt/5.12.1/msvc2017_64/bin:$PATH\" &&
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
-    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\" QT_OPENGL_ENABLED=0"
+    make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
diff --git a/Makefile b/Makefile
index 88c038b..4b5940e 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,7 @@ ${PYSIDE_SRC_DIR}:
 	# Patch to prevent complete overriding of LD_LIBRARY_PATH
 	#patch "${PYSIDE_SRC_DIR}/sources/pyside2/cmake/Macros/PySideModules.cmake" patch/pyside2-PySideModules.cmake.patch
 
-ifeq (${QT_OPENGL_ENABLED},1)
+ifneq (${QT_OPENGL_ENABLED},1)
 	# Patches to remove OpenGL-related source files.
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtGui/CMakeLists.txt" patch/pyside-5.12.1/QtGui-CMakeLists.txt.patch
 	patch "${PYSIDE_SRC_DIR}/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt" patch/pyside-5.12.1/QtWidgets-CMakeLists.txt.patch

From c65688e3679e0e13ec6c3318cab94e9086ac93ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 13 Mar 2019 15:56:37 +0100
Subject: [PATCH 44/44] Deploy from AppVeyor

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

diff --git a/.appveyor.yml b/.appveyor.yml
index a4f3451..932367d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,3 +15,11 @@ build_script:
     export LLVM_INSTALL_DIR=\"C:\Program Files\LLVM\" &&
     make PYTHON_WINDOWS=\"C:\Python36-x64\" QT_PREFIX=\"C:\Qt\5.12.1\msvc2017_64\""
 
+deploy:
+  description: "cutter-deps"
+  provider: GitHub
+  auth_token:
+    secure: zMlNzVP9WsKDBhzIYyjRrrGwow232C6kivY7zG7Neu9XdbXqbPKFEQbb3XYSGZRQ
+  artifact: cutter-deps-win.tar.gz
+  on:
+    APPVEYOR_REPO_TAG: true