From 96bc6f478f566b6034f6ff3f37eeaf533f32cef0 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 20 Feb 2015 10:12:47 +0000
Subject: [PATCH] Tweaks to windows build

---
 data/windows/app.py             | 6 +++++-
 data/windows/build-win32.sh     | 3 ---
 data/windows/build-win64.sh     | 3 ---
 source/utils/CarlaPipeUtils.cpp | 3 ---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/data/windows/app.py b/data/windows/app.py
index 44c09f5cb..612183fdd 100644
--- a/data/windows/app.py
+++ b/data/windows/app.py
@@ -15,7 +15,11 @@ from carla_host import VERSION
 
 options = {
   "icon": ".\\resources\\ico\\carla.ico",
-  "packages": ["re", "sip", "subprocess", "inspect"]
+  "packages": [],
+  "includes": ["re", "sip", "subprocess", "inspect"],
+  "build_exe": ".\\data\\windows\\Carla\\",
+  "optimize": True,
+  "compressed": True
 }
 
 setup(name = "Carla",
diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh
index b93e527b1..539d961b9 100755
--- a/data/windows/build-win32.sh
+++ b/data/windows/build-win32.sh
@@ -64,14 +64,11 @@ rm -rf ./data/windows/Carla
 cp ./source/carla ./source/Carla.pyw
 $PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/Carla.pyw
-mv build data/windows/Carla
 
 cd data/windows/
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
-mv Carla/exe.*/* Carla/
 rm Carla/carla-discovery-native.exe
-rmdir Carla/exe.*
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh
index 978b59575..4fbdd50a3 100755
--- a/data/windows/build-win64.sh
+++ b/data/windows/build-win64.sh
@@ -65,14 +65,11 @@ rm -rf ./data/windows/Carla
 cp ./source/carla ./source/Carla.pyw
 $PYTHON_EXE ./data/windows/app.py build_exe
 rm -f ./source/Carla.pyw
-mv build data/windows/Carla
 
 cd data/windows/
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
-mv Carla/exe.*/* Carla/
 rm Carla/carla-discovery-native.exe
-rmdir Carla/exe.*
 
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd
 
diff --git a/source/utils/CarlaPipeUtils.cpp b/source/utils/CarlaPipeUtils.cpp
index 3faa8fd42..78b62e4bb 100644
--- a/source/utils/CarlaPipeUtils.cpp
+++ b/source/utils/CarlaPipeUtils.cpp
@@ -162,9 +162,6 @@ bool startProcess(const char* const argv[], PROCESS_INFORMATION* const processIn
 
     String command;
 
-    // TESTING
-    command = "C:\\Python34\\python.exe ";
-
     for (int i=0; argv[i] != nullptr; ++i)
     {
         String arg(argv[i]);