From 49bf958ea44051ecc5bcf53372039851d25bcf25 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 28 Dec 2016 05:27:52 +0000 Subject: [PATCH] Allow build of plugin bridges for windows --- Makefile | 8 ++++++++ data/windows/build-win32.sh | 2 +- data/windows/build-win64.sh | 3 ++- source/bridges-plugin/Makefile | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 29ac75658..3986e5fee 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,11 @@ posix64: $(LIBS_POSIX64) # ---------------------------------------------------------------------------------------------------------------------------- # Binaries (win32) +ifeq ($(BUILDING_FOR_WINDOWS),true) +LIBS_WIN32 = $(MODULEDIR)/jackbridge.win32.a +else LIBS_WIN32 = $(MODULEDIR)/jackbridge.win32e.a +endif LIBS_WIN32 += $(MODULEDIR)/juce_audio_basics.win32.a LIBS_WIN32 += $(MODULEDIR)/juce_audio_processors.win32.a LIBS_WIN32 += $(MODULEDIR)/juce_core.win32.a @@ -220,7 +224,11 @@ win32: $(LIBS_WIN32) # ---------------------------------------------------------------------------------------------------------------------------- # Binaries (win64) +ifeq ($(BUILDING_FOR_WINDOWS),true) +LIBS_WIN64 = $(MODULEDIR)/jackbridge.win64.a +else LIBS_WIN64 = $(MODULEDIR)/jackbridge.win64e.a +endif LIBS_WIN64 += $(MODULEDIR)/juce_audio_basics.win64.a LIBS_WIN64 += $(MODULEDIR)/juce_audio_processors.win64.a LIBS_WIN64 += $(MODULEDIR)/juce_core.win64.a diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh index a18653098..3303080fb 100755 --- a/data/windows/build-win32.sh +++ b/data/windows/build-win32.sh @@ -38,7 +38,7 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe export DEFAULT_QT=5 -make $JOBS +make BUILDING_FOR_WINDOWS=true $JOBS export PYTHONPATH=`pwd`/source diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh index 46d17f889..2755b4af3 100755 --- a/data/windows/build-win64.sh +++ b/data/windows/build-win64.sh @@ -39,7 +39,8 @@ export PYRCC="wine C:\\\\Python34\\\\Lib\\\\site-packages\\\\PyQt5\\\\pyrcc5.exe export DEFAULT_QT=5 -make $JOBS +make BUILDING_FOR_WINDOWS=true $JOBS +make BUILDING_FOR_WINDOWS=true LDFLAGS="-L/opt/mingw32/i686-w64-mingw32/lib/" win32 $JOBS export PYTHONPATH=`pwd`/source diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index 06a54f20c..65b453f66 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -38,8 +38,13 @@ endif LIBS_native = $(MODULEDIR)/jackbridge.a LIBS_posix32 = $(MODULEDIR)/jackbridge.posix32.a LIBS_posix64 = $(MODULEDIR)/jackbridge.posix64.a +ifeq ($(BUILDING_FOR_WINDOWS),true) +LIBS_win32 = $(MODULEDIR)/jackbridge.win32.a +LIBS_win64 = $(MODULEDIR)/jackbridge.win64.a +else LIBS_win32 = $(MODULEDIR)/jackbridge.win32e.a LIBS_win64 = $(MODULEDIR)/jackbridge.win64e.a +endif LINK_FLAGS += $(JACKBRIDGE_LIBS) LIBS_native += $(MODULEDIR)/juce_audio_basics.a