Browse Source

More build fixes for bridges, fix make clean without PyQt

Signed-off-by: falkTX <falktx@falktx.com>
pull/1933/head
falkTX 1 month ago
parent
commit
362f031960
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 15 additions and 8 deletions
  1. +9
    -8
      source/frontend/Makefile
  2. +6
    -0
      source/modules/distrho/DistrhoUtils.hpp

+ 9
- 8
source/frontend/Makefile View File

@@ -34,10 +34,6 @@ else
NON_STATIC_LINK_FLAGS = $(LINK_FLAGS) NON_STATIC_LINK_FLAGS = $(LINK_FLAGS)
endif endif


ifeq (,$(FRONTEND_TYPE))
$(error Trying to build frontend without Qt and/or PyQt, cannot continue)
endif

ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
QT_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_utils.dll QT_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_utils.dll
else else
@@ -154,21 +150,26 @@ all: $(BINDIR)/libcarla_frontend$(LIB_EXT) $(QMs) $(RES) $(UIs)


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


dialogs/ui_%.h: dialogs/%.ui
dialogs/ui_%.h: dialogs/%.ui qt_config.py
$(UIC) $< -o $@ $(UIC) $< -o $@


pluginlist/ui_%.h: pluginlist/%.ui
pluginlist/ui_%.h: pluginlist/%.ui qt_config.py
$(UIC) $< -o $@ $(UIC) $< -o $@


%_ui.py: %.ui
%_ui.py: %.ui qt_config.py
$(PYUIC) $< -o $@ $(PYUIC) $< -o $@


ui_%.py: $(RESDIR)/ui/%.ui
ui_%.py: $(RESDIR)/ui/%.ui qt_config.py
$(PYUIC) $< -o $@ $(PYUIC) $< -o $@


qt_config.py: qt_config.py:
ifneq (,$(FRONTEND_TYPE))
echo "#!/usr/bin/env python3" > $@ echo "#!/usr/bin/env python3" > $@
echo "qt = $(FRONTEND_TYPE)" >> $@ echo "qt = $(FRONTEND_TYPE)" >> $@
else
@echo Error: Trying to build frontend without Qt and/or PyQt, cannot continue
@false
endif


resources_rc.py: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg $(RESDIR)/*/*.svgz resources_rc.py: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg $(RESDIR)/*/*.svgz
$(PYRCC) $< -o $@ $(PYRCC) $< -o $@


+ 6
- 0
source/modules/distrho/DistrhoUtils.hpp View File

@@ -19,6 +19,12 @@


#include "src/DistrhoDefines.h" #include "src/DistrhoDefines.h"


#if defined(DISTRHO_OS_WINDOWS) && !defined(_MSC_VER)
#include <winsock2.h>
#undef max
#undef min
#endif

#include <cstdarg> #include <cstdarg>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>


Loading…
Cancel
Save