Tweak packaging for new frontend lib
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
4495215cb9
commit
aa400535b3
|
@ -91,22 +91,24 @@ _CARLA_HOST_FILES += carla-discovery-win32$(APP_EXT)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
_CARLA_APP_FILES = \
|
_CARLA_APP_FILES = \
|
||||||
Carla$(APP_EXT) \
|
|
||||||
$(_CARLA_HOST_FILES) \
|
$(_CARLA_HOST_FILES) \
|
||||||
$(_PYTHON_FILES) \
|
$(_PYTHON_FILES) \
|
||||||
$(_QT5_DLLS) \
|
$(_QT5_DLLS) \
|
||||||
$(_QT5_PLUGINS) \
|
$(_QT5_PLUGINS) \
|
||||||
$(_THEME_FILES) \
|
$(_THEME_FILES) \
|
||||||
|
libcarla_frontend$(LIB_EXT) \
|
||||||
resources/lib
|
resources/lib
|
||||||
|
|
||||||
ifneq ($(EMBED_TARGET),true)
|
ifneq ($(EMBED_TARGET),true)
|
||||||
_CARLA_APP_FILES += \
|
_CARLA_APP_FILES += \
|
||||||
|
Carla$(APP_EXT) \
|
||||||
libcarla_host-plugin$(LIB_EXT) \
|
libcarla_host-plugin$(LIB_EXT) \
|
||||||
libcarla_native-plugin$(LIB_EXT) \
|
libcarla_native-plugin$(LIB_EXT) \
|
||||||
libcarla_standalone2$(LIB_EXT)
|
libcarla_standalone2$(LIB_EXT)
|
||||||
|
|
||||||
_CARLA_CONTROL_APP_FILES = \
|
_CARLA_CONTROL_APP_FILES = \
|
||||||
Carla-Control$(APP_EXT) \
|
Carla-Control$(APP_EXT) \
|
||||||
|
libcarla_frontend$(LIB_EXT) \
|
||||||
libcarla_utils$(LIB_EXT) \
|
libcarla_utils$(LIB_EXT) \
|
||||||
$(_PYTHON_FILES) \
|
$(_PYTHON_FILES) \
|
||||||
$(_QT5_DLLS) \
|
$(_QT5_DLLS) \
|
||||||
|
@ -369,6 +371,9 @@ build/Carla/lib/library.zip: $(CARLA_PLUGIN_ZIPS) data/windows/app-gui.py source
|
||||||
zip -r -9 ../library.zip *)
|
zip -r -9 ../library.zip *)
|
||||||
rm -rf build/Carla/lib/_lib
|
rm -rf build/Carla/lib/_lib
|
||||||
rm -rf build/Carla/lib/library-main.zip
|
rm -rf build/Carla/lib/library-main.zip
|
||||||
|
ifeq ($(EMBED_TARGET),true)
|
||||||
|
rm -f build/Carla/Carla.exe
|
||||||
|
endif
|
||||||
|
|
||||||
build/Carla-Control/lib/library.zip: data/windows/app-gui.py source/frontend/* resources/ico/carla-control.ico
|
build/Carla-Control/lib/library.zip: data/windows/app-gui.py source/frontend/* resources/ico/carla-control.ico
|
||||||
$(call GENERATE_LIBRARY_ZIP,Carla-Control)
|
$(call GENERATE_LIBRARY_ZIP,Carla-Control)
|
||||||
|
|
|
@ -47,7 +47,11 @@ else
|
||||||
$(error Trying to build frontend without Qt5, cannot continue)
|
$(error Trying to build frontend without Qt5, cannot continue)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WINDOWS),true)
|
||||||
|
QT5_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_utils.dll
|
||||||
|
else
|
||||||
QT5_LINK_FLAGS += -L$(BINDIR) -lcarla_utils
|
QT5_LINK_FLAGS += -L$(BINDIR) -lcarla_utils
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(MACOS),true)
|
ifeq ($(MACOS),true)
|
||||||
QT5_LINK_FLAGS += -install_name @rpath/libcarla_frontend.dylib
|
QT5_LINK_FLAGS += -install_name @rpath/libcarla_frontend.dylib
|
||||||
|
|
Loading…
Reference in New Issue