From b0ef81214adcdcc009dbdd393f48d0252678b4ce Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Tue, 29 Oct 2019 01:35:15 -0500
Subject: [PATCH] Fix cmakelists and use zip

---
 CMakeLists.txt              | 10 +++++-----
 src/runner/pythonrunner.cpp |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53f499a..b2e4c5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,12 +12,12 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 
 # need to install python
-IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll")
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin)
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb)
+IF(EXISTS "${PYTHON_ROOT}/PCbuild/python37.dll")
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.dll DESTINATION bin)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python37.pdb DESTINATION pdb)
 ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/amd64/python27.dll")
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin)
-    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.dll DESTINATION bin)
+    INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python37.pdb DESTINATION pdb)
 ENDIF()
 
 
diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp
index 5c8d91f..3762f96 100644
--- a/src/runner/pythonrunner.cpp
+++ b/src/runner/pythonrunner.cpp
@@ -1401,6 +1401,7 @@ bool handled_exec_file(bpy::str filename, bpy::object globals = bpy::object(), b
 void PythonRunner::initPath()
 {
   static QStringList paths = {
+    QCoreApplication::applicationDirPath() + "/pythoncore.zip",
     QCoreApplication::applicationDirPath() + "/pythoncore",
     m_MOInfo->pluginDataPath()
   };