Browse Source

Fix cross-compilation without an exe wrapper

tags/v2.3.0-RC1
falkTX 3 years ago
parent
commit
44e872bebf
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 18 additions and 12 deletions
  1. +2
    -0
      Makefile
  2. +16
    -0
      source/Makefile.mk
  3. +0
    -12
      source/plugin/Makefile

+ 2
- 0
Makefile View File

@@ -720,6 +720,7 @@ endif # HAVE_PYQT

# -------------------------------------------------------------------------------------------------------------

ifeq ($(CAN_GENERATE_LV2_TTL),true)
# Install lv2 plugin
install -d $(DESTDIR)$(LIBDIR)/lv2/carla.lv2

@@ -733,6 +734,7 @@ endif # HAVE_PYQT
$(LINK) ../../carla/$$i $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/$$i; \
done
rm -f $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/libcarla_standalone2.*
endif

ifeq ($(LINUX),true)
# Link jack app bridge


+ 16
- 0
source/Makefile.mk View File

@@ -764,6 +764,22 @@ endif
LINK := ln -sf

# ---------------------------------------------------------------------------------------------------------------------
# Check if we can generate ttl files

ifneq ($(BUILDING_FOR_WINE),true)
ifeq ($(CROSS_COMPILING),true)
NEEDS_WINE = true
endif
endif

ifneq ($(CROSS_COMPILING),true)
CAN_GENERATE_LV2_TTL = true
else ifeq ($(NEEDS_WINE),true)
CAN_GENERATE_LV2_TTL = true
endif

# ---------------------------------------------------------------------------------------------------------------------
# Check if we should build the external plugins

ifneq ($(DEBUG),true)
ifneq ($(TESTBUILD),true)


+ 0
- 12
source/plugin/Makefile View File

@@ -44,18 +44,6 @@ ifeq ($(HAVE_X11),true)
BUILD_CXX_FLAGS += $(X11_FLAGS)
endif

ifeq ($(BUILDING_FOR_WINDOWS),true)
ifeq ($(CROSS_COMPILING),true)
NEEDS_WINE = true
endif
endif

ifneq ($(CROSS_COMPILING),true)
CAN_GENERATE_LV2_TTL = true
else ifeq ($(NEEDS_WINE),true)
CAN_GENERATE_LV2_TTL = true
endif

# ---------------------------------------------------------------------------------------------------------------------
# Libs



Loading…
Cancel
Save