diff --git a/data/windows/build-win.sh b/data/windows/build-win.sh index 2a8cfbbb8..454a21819 100755 --- a/data/windows/build-win.sh +++ b/data/windows/build-win.sh @@ -33,7 +33,7 @@ if [ x"${ARCH}" = x"32nosse" ]; then MAKE_ARGS="${MAKE_ARGS} NOOPT=true" fi -MAKE_ARGS="${MAKE_ARGS} BUILDING_FOR_WINDOWS=true USING_JUCE=true" +MAKE_ARGS="${MAKE_ARGS} BUILDING_FOR_WINDOWS=true CROSS_COMPILING=true" export WIN32=true diff --git a/source/plugin/Makefile b/source/plugin/Makefile index dcff28173..6cc849537 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -44,6 +44,12 @@ ifeq ($(HAVE_X11),true) BUILD_CXX_FLAGS += $(X11_FLAGS) endif +ifeq ($(BUILDING_FOR_WINDOWS),true) +ifeq ($(CROSS_COMPILING),true) +NEEDS_WINE = true +endif +endif + # --------------------------------------------------------------------------------------------------------------------- # Libs @@ -458,7 +464,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(BINDIR)/car @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT) @echo "Generating LV2 ttl data" -ifeq ($(BUILDING_FOR_WINDOWS),true) +ifeq ($(NEEDS_WINE),true) @cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT) else @cd $(BINDIR) && ./carla-lv2-export$(APP_EXT)