Tweaks to windows build

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",

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
 

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
 

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]);