From 2cccf2a1d50367d63b540ce0ff8ee809f05fe530 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 11 Mar 2015 22:30:37 +0100 Subject: [PATCH] Update windows build scripts --- Makefile | 2 +- data/windows/build-win32.sh | 8 ++++---- data/windows/build-win64.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 102dd47ac..2b03a14fb 100644 --- a/Makefile +++ b/Makefile @@ -376,7 +376,7 @@ clean: rm -f *~ source/*~ source/*.pyc source/*_rc.py source/ui_*.py distclean: clean - rm -f bin/*.dll bin/*.so + rm -f bin/*.exe bin/*.dll bin/*.dylib bin/*.so rm -rf build build-lv2 debug: diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh index abd33e1e3..3bc58e2b7 100755 --- a/data/windows/build-win32.sh +++ b/data/windows/build-win32.sh @@ -56,13 +56,12 @@ rm Carla/carla-lv2-export.exe # FIXME rm Carla/carla-bridge-lv2-windows.exe +rm Carla/carla-bridge-native.exe -rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd +rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd Carla/PyQt5.QtXml.pyd cp $WINEPREFIX/drive_c/Python34/python34.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icudt49.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icuin49.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icuuc49.dll Carla/ +cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libEGL.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libGLESv2.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll Carla/ @@ -73,6 +72,7 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5PrintSupport.dll Carl cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll Carla/ # Build unzipfx +make -C unzipfx-carla -f Makefile.win32 clean make -C unzipfx-carla -f Makefile.win32 # Create zip of Carla diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh index 26ad126cc..609710b45 100755 --- a/data/windows/build-win64.sh +++ b/data/windows/build-win64.sh @@ -57,13 +57,12 @@ rm Carla/carla-lv2-export.exe # FIXME rm Carla/carla-bridge-lv2-windows.exe +rm Carla/carla-bridge-native.exe -rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd +rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd Carla/PyQt5.QtXml.pyd cp $WINEPREFIX/drive_c/Python34/python34.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icudt49.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icuin49.dll Carla/ -cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icuuc49.dll Carla/ +cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libEGL.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libGLESv2.dll Carla/ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll Carla/ @@ -74,6 +73,7 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5PrintSupport.dll Carl cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll Carla/ # Build unzipfx +make -C unzipfx-carla -f Makefile.win32 clean make -C unzipfx-carla -f Makefile.win32 # Create zip of Carla