Browse Source

Do not use wine for native win32 builds

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
a20036e1b0
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 2 deletions
  1. +1
    -1
      data/windows/build-win.sh
  2. +7
    -1
      source/plugin/Makefile

+ 1
- 1
data/windows/build-win.sh View File

@@ -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



+ 7
- 1
source/plugin/Makefile View File

@@ -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)


Loading…
Cancel
Save