Fix windows build

data/windows/build-win32.sh

@@ -5,7 +5,7 @@ set -e
 MINGW=i686-w64-mingw32
 MINGW_PATH=/opt/mingw32
 
-JOBS="-j 8"
+JOBS="-j 2"
 
 if [ ! -f Makefile ]; then
   cd ../..
@@ -18,8 +18,10 @@ export CC=$MINGW-gcc
 export CXX=$MINGW-g++
 export WINDRES=$MINGW-windres
 
-export CFLAGS=-DPTW32_STATIC_LIB
-export CXXFLAGS=-DPTW32_STATIC_LIB
+export CFLAGS="-DPTW32_STATIC_LIB"
+export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL"
+unset CPPFLAGS
+unset LDFLAGS
 
 export WINEARCH=win32
 export WINEPREFIX=~/.winepy3_x86
@@ -39,7 +41,8 @@ make $JOBS UI RES WIDGETS
 
 # Build discovery
 make $JOBS discovery
-mv bin/carla-discovery-native.exe bin/carla-discovery-win32.exe
+rm bin/carla-discovery-win32.exe
+cp bin/carla-discovery-native.exe bin/carla-discovery-win32.exe
 
 # Build backend
 make $JOBS backend
@@ -62,6 +65,7 @@ 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

@@ -5,7 +5,7 @@ set -e
 MINGW=x86_64-w64-mingw32
 MINGW_PATH=/opt/mingw64
 
-JOBS="-j 8"
+JOBS="-j 2"
 
 if [ ! -f Makefile ]; then
   cd ../..
@@ -19,8 +19,10 @@ export CC=$MINGW-gcc
 export CXX=$MINGW-g++
 export WINDRES=$MINGW-windres
 
-export CFLAGS=-DPTW32_STATIC_LIB
-export CXXFLAGS=-DPTW32_STATIC_LIB
+export CFLAGS="-DPTW32_STATIC_LIB"
+export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL"
+unset CPPFLAGS
+unset LDFLAGS
 
 export WINEARCH=win64
 export WINEPREFIX=~/.winepy3_x64
@@ -40,7 +42,8 @@ make $JOBS UI RES WIDGETS
 
 # Build discovery
 make $JOBS discovery
-mv bin/carla-discovery-native.exe bin/carla-discovery-win64.exe
+rm bin/carla-discovery-win64.exe
+cp bin/carla-discovery-native.exe bin/carla-discovery-win64.exe
 
 # Build backend
 make $JOBS backend
@@ -63,6 +66,7 @@ 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/unzipfx-carla/unzipfx/appDetails.h

@@ -2,6 +2,7 @@
 #ifndef __APP_DETAILS_H__
 #define __APP_DETAILS_H__
 
+#define REAL_BUILD
 #include "../../../../source/includes/CarlaDefines.h"
 
 #define SFX_APP_VERSION CARLA_VERSION_STRING

source/bridges-ui/Makefile

@@ -4,6 +4,8 @@
 # Created by falkTX
 #
 
+# TODO: $(LIBS_START) + $(LIBS_END)
+
 include ../Makefile.mk
 
 # --------------------------------------------------------------
@@ -232,7 +234,7 @@ OBJS_LV2_WINDOWS = \
 	CarlaBridgeUI-LV2__lv2-windows.o
 
 ../../bin/carla-bridge-lv2-windows.exe: $(OBJS_LV2_WINDOWS) $(OBJS_LV2_LIBS_JUCE_UI)
-	$(CXX) $^ $(LINK_LV2_WINDOWS_FLAGS) -o $@
+	$(CXX) $(OBJS_LV2_WINDOWS) $(LIBS_START) $(OBJS_LV2_LIBS_JUCE_UI) $(LIBS_END) $(LINK_LV2_WINDOWS_FLAGS) -o $@
 
 %__lv2-windows.o: %.cpp
 	$(CXX) $< $(BUILD_LV2_WINDOWS_FLAGS) -c -o $@