From bb7b9a4ab1ba8b676635c0c567bfe94f02b7f280 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 3 Jan 2017 16:23:41 +0000 Subject: [PATCH] Don't ship lv2-windows ui bridge; Fix 64bit win32 build --- data/windows/build-win32.sh | 1 + data/windows/build-win64.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh index af4af8220..2302c313b 100755 --- a/data/windows/build-win32.sh +++ b/data/windows/build-win32.sh @@ -61,6 +61,7 @@ $CXFREEZE ../../bin/resources/carla-plugin-patchbay cp ../../bin/*.dll Carla/ cp ../../bin/*.exe Carla/ +rm Carla/carla-bridge-lv2-windows.exe rm Carla/carla-discovery-native.exe rm Carla/carla-lv2-export.exe diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh index bb6ade164..7f9670ca8 100755 --- a/data/windows/build-win64.sh +++ b/data/windows/build-win64.sh @@ -40,7 +40,7 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe export DEFAULT_QT=5 make BUILDING_FOR_WINDOWS=true $JOBS -make BUILDING_FOR_WINDOWS=true LDFLAGS="-L/opt/mingw32/i686-w64-mingw32/lib/" win32 $JOBS +make BUILDING_FOR_WINDOWS=true LDFLAGS="-L/opt/mingw32/lib -L/opt/mingw32/i686-w64-mingw32/lib" win32 $JOBS export PYTHONPATH=`pwd`/source @@ -63,6 +63,7 @@ $CXFREEZE ../../bin/resources/carla-plugin-patchbay cp ../../bin/*.dll Carla/ cp ../../bin/*.exe Carla/ +rm Carla/carla-bridge-lv2-windows.exe rm Carla/carla-discovery-native.exe rm Carla/carla-lv2-export.exe