Browse Source

Windows related fixes

tags/1.9.4
falkTX 12 years ago
parent
commit
f90831e8e4
4 changed files with 23 additions and 5 deletions
  1. +8
    -2
      data/windows/build-win32.sh
  2. +8
    -2
      data/windows/build-win64.sh
  3. +1
    -0
      source/backend/standalone/CarlaStandalone.cpp
  4. +6
    -1
      source/carla.py

+ 8
- 2
data/windows/build-win32.sh View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash


set -e

MINGW=i686-w64-mingw32 MINGW=i686-w64-mingw32
MINGW_PATH=/opt/mingw32 MINGW_PATH=/opt/mingw32


@@ -51,7 +53,9 @@ make $JOBS -C source/backend/standalone ../libcarla_standalone.dll CARLA_RTAUDIO
DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN="" DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN=""


rm -rf ./data/windows/Carla rm -rf ./data/windows/Carla
$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.py"
cp ./source/carla.py ./source/carla.pyw
$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
rm -f ./source/carla.pyw


cd data/windows cd data/windows
mkdir Carla/backend mkdir Carla/backend
@@ -76,13 +80,15 @@ make -C unzipfx-carla -f Makefile.win32


# Create static build # Create static build
rm -f Carla.zip rm -f Carla.zip
zip -r Carla.zip Carla
zip -r -9 Carla.zip Carla


rm -f Carla.exe rm -f Carla.exe
cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
chmod +x Carla.exe chmod +x Carla.exe


# Cleanup
make -C unzipfx-carla -f Makefile.win32 clean make -C unzipfx-carla -f Makefile.win32 clean
rm -f Carla.zip


# Testing: # Testing:
echo "export WINEPREFIX=~/.winepy3" echo "export WINEPREFIX=~/.winepy3"


+ 8
- 2
data/windows/build-win64.sh View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash


set -e

MINGW=x86_64-w64-mingw32 MINGW=x86_64-w64-mingw32
MINGW_PATH=/opt/mingw64 MINGW_PATH=/opt/mingw64


@@ -51,7 +53,9 @@ make $JOBS -C source/backend/standalone ../libcarla_standalone.dll CARLA_RTAUDIO
DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN="" DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN=""


rm -rf ./data/windows/Carla rm -rf ./data/windows/Carla
$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.py"
cp ./source/carla.py ./source/carla.pyw
$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
rm -f ./source/carla.pyw


cd data/windows cd data/windows
mkdir Carla/backend mkdir Carla/backend
@@ -76,13 +80,15 @@ make -C unzipfx-carla -f Makefile.win32


# Create static build # Create static build
rm -f Carla.zip rm -f Carla.zip
zip -r Carla.zip Carla
zip -r -9 Carla.zip Carla


rm -f Carla.exe rm -f Carla.exe
cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
chmod +x Carla.exe chmod +x Carla.exe


# Cleanup
make -C unzipfx-carla -f Makefile.win32 clean make -C unzipfx-carla -f Makefile.win32 clean
rm -f Carla.zip


# Testing: # Testing:
echo "export WINEPREFIX=~/.winepy3_x64" echo "export WINEPREFIX=~/.winepy3_x64"


+ 1
- 0
source/backend/standalone/CarlaStandalone.cpp View File

@@ -80,6 +80,7 @@ struct CarlaBackendStandalone {
app->quit(); app->quit();
app->processEvents(); app->processEvents();
delete app; delete app;
app = nullptr;
} }


} standalone; } standalone;


+ 6
- 1
source/carla.py View File

@@ -739,7 +739,12 @@ class CarlaMainW(QMainWindow):


settings = QSettings() settings = QSettings()


Carla.processMode = settings.value("Engine/ProcessMode", PROCESS_MODE_MULTIPLE_CLIENTS, type=int)
if LINUX:
defaultMode = PROCESS_MODE_MULTIPLE_CLIENTS
else:
defaultMode = PROCESS_MODE_CONTINUOUS_RACK

Carla.processMode = settings.value("Engine/ProcessMode", defaultMode, type=int)
Carla.maxParameters = settings.value("Engine/MaxParameters", MAX_DEFAULT_PARAMETERS, type=int) Carla.maxParameters = settings.value("Engine/MaxParameters", MAX_DEFAULT_PARAMETERS, type=int)


transportMode = settings.value("Engine/TransportMode", TRANSPORT_MODE_JACK, type=int) transportMode = settings.value("Engine/TransportMode", TRANSPORT_MODE_JACK, type=int)


Loading…
Cancel
Save