diff --git a/Makefile b/Makefile index 4b732e87e..8cb7dcdbd 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,9 @@ discovery: plugin: $(MAKE) -C source/plugin +tests: + $(MAKE) -C source/tests + theme: $(MAKE) -C source/theme diff --git a/source/Makefile.mk b/source/Makefile.mk index 8d7e56da9..00782e90f 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -42,7 +42,6 @@ BASE_FLAGS += -DDEBUG -O0 -g CMD_STRIP = \# no-strip else BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden -# BASE_FLAGS += -DCARLA_NO_ASSERTS CMD_STRIP = && $(STRIP) endif @@ -54,7 +53,8 @@ BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++0x $(CXXFLAGS) LINK_FLAGS = $(LDFLAGS) ifeq ($(MACOS),true) -# No C++11 support, force 32bit per default +# No C++11 support; force 32bit per default +BUILD_C_FLAGS = $(BASE_FLAGS) $(32BIT_FLAGS) -std=gnu99 $(CFLAGS) BUILD_CXX_FLAGS = $(BASE_FLAGS) $(32BIT_FLAGS) $(CXXFLAGS) endif diff --git a/source/discovery/Makefile b/source/discovery/Makefile index 29368d63c..72acb1b60 100644 --- a/source/discovery/Makefile +++ b/source/discovery/Makefile @@ -40,6 +40,11 @@ POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu POSIX_LINK_FLAGS = $(LINK_FLAGS) -ldl +ifeq ($(MACOS),true) +POSIX_32BIT_FLAGS = $(32BIT_FLAGS) +POSIX_64BIT_FLAGS = $(64BIT_FLAGS) +endif + WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) diff --git a/source/libs/Makefile b/source/libs/Makefile index eeaf4e846..31ba86899 100644 --- a/source/libs/Makefile +++ b/source/libs/Makefile @@ -60,7 +60,7 @@ jackbridge-wine64: # -------------------------------------------------------------- clean: - rm -f *~ *.a *.def *.dll *.dylib *.so + rm -f *.a *.def *.dll *.dylib *.so $(MAKE) clean -C distrho/dgl $(MAKE) clean -C lilv $(MAKE) clean -C rtmempool diff --git a/source/libs/jackbridge/Makefile b/source/libs/jackbridge/Makefile index 590440e2e..6f4f0bc8b 100644 --- a/source/libs/jackbridge/Makefile +++ b/source/libs/jackbridge/Makefile @@ -46,15 +46,15 @@ test: $(OBJS) $(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_LINK_FLAGS) -o $@ ../jackbridge-win32.dll: $(OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ && $(STRIP) $@ + $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ $(CMD_STRIP) $@ ../jackbridge-win64.dll: $(OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ && $(STRIP) $@ + $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ $(CMD_STRIP) $@ ../jackbridge-win32.dll.so: $(OBJS) ../jackbridge-win32.dll.def - $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@ + $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ $(CMD_STRIP) $@ ../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def - $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ && $(STRIP) $@ + $(WINECXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ $(CMD_STRIP) $@ # -------------------------------------------------------------- diff --git a/source/libs/lilv/Makefile b/source/libs/lilv/Makefile index 932d4240c..6312be94a 100644 --- a/source/libs/lilv/Makefile +++ b/source/libs/lilv/Makefile @@ -13,7 +13,7 @@ SORD_VERSION = 0.12.0 SRATOM_VERSION = 0.4.2 LILV_VERSION = 0.16.0 -BUILD_C_FLAGS += -fvisibility=hidden -fPIC -w +BUILD_C_FLAGS += -w BUILD_C_FLAGS += -Iconfig -I../../includes OBJS = serd.c.o sord.c.o sratom.c.o lilv.c.o @@ -49,13 +49,13 @@ win64: ../lilv.win64.a $(AR) rs $@ $^ ../lilv.dll: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ ../lilv.dylib: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ ../lilv.so: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ # -------------------------------------------------------------- diff --git a/source/libs/rtmempool/Makefile b/source/libs/rtmempool/Makefile index c05a626be..1a5f999f9 100644 --- a/source/libs/rtmempool/Makefile +++ b/source/libs/rtmempool/Makefile @@ -8,7 +8,7 @@ include ../../Makefile.mk # -------------------------------------------------------------- -BUILD_C_FLAGS += -fvisibility=hidden -fPIC -pthread +BUILD_C_FLAGS += -pthread BUILD_C_FLAGS += -I. -I../../includes ifeq ($(CARLA_PLUGIN_SUPPORT),true) @@ -50,13 +50,13 @@ win64: ../rtmempool.win64.a $(AR) rs $@ $^ ../rtmempool.dll: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ ../rtmempool.dylib: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ ../rtmempool.so: $(OBJS) - $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@ # -------------------------------------------------------------- diff --git a/source/theme/Makefile b/source/theme/Makefile index 9646739d5..62b04684b 100644 --- a/source/theme/Makefile +++ b/source/theme/Makefile @@ -18,6 +18,8 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) endif +# -------------------------------------------------------------- + FILES = \ moc_CarlaStyle.cpp \ moc_CarlaStylePrivate.cpp \ @@ -41,6 +43,18 @@ OBJS_posix64 = \ moc_CarlaStylePrivate.cpp.posix64.o \ CarlaStyle.cpp.posix64.o +OBJS_win32 = \ + moc_CarlaStyle.cpp.win32.o \ + moc_CarlaStyleAnimations.cpp.win32.o \ + moc_CarlaStylePrivate.cpp.win32.o \ + CarlaStyle.cpp.win32.o + +OBJS_win64 = \ + moc_CarlaStyle.cpp.win64.o \ + moc_CarlaStyleAnimations.cpp.win64.o \ + moc_CarlaStylePrivate.cpp.win64.o \ + CarlaStyle.cpp.win64.o + OBJS_shared = $(OBJS) \ CarlaStyle.export.cpp.o @@ -54,7 +68,7 @@ TARGET = ../libs/theme.a all: $(TARGET) clean: - rm -f $(FILES) $(OBJS_shared) $(OBJS_static) $(TARGET) + rm -f $(FILES) $(TARGET) *.o debug: $(MAKE) DEBUG=true @@ -62,25 +76,16 @@ debug: # -------------------------------------------------------------- $(TARGET): $(FILES) $(OBJS_static) - $(AR) crs $@ $(OBJS_static) + $(AR) rs $@ $(OBJS_static) carlastyle.dll: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ -ifneq ($(DEBUG),true) - $(STRIP) $@ -endif + $(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ $(CMD_STRIP) $@ carlastyle.dynlib: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) $(LINK_FLAGS) -dynamiclib -o $@ -ifneq ($(DEBUG),true) - $(STRIP) $@ -endif + $(CXX) $(OBJS_shared) $(LINK_FLAGS) -dynamiclib -o $@ $(CMD_STRIP) $@ carlastyle.so: $(FILES) $(OBJS_shared) - $(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ -ifneq ($(DEBUG),true) - $(STRIP) $@ -endif + $(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ $(CMD_STRIP) $@ # -------------------------------------------------------------- diff --git a/source/utils/CarlaLv2Utils.hpp b/source/utils/CarlaLv2Utils.hpp index 7677fa73a..7ed7695f7 100644 --- a/source/utils/CarlaLv2Utils.hpp +++ b/source/utils/CarlaLv2Utils.hpp @@ -725,7 +725,7 @@ const LV2_RDF_Descriptor* lv2_rdf_new(const LV2_URI uri, const bool fillPresets if (lilvPort.has_property(gLv2World.reportsLatency)) rdfPort->Designation = LV2_PORT_DESIGNATION_LATENCY; - // no port properties, check if port uses old ones + // no port properties set, check if using old/invalid ones if (rdfPort->Properties == 0x0) { static const Lilv::Node oldPropArtifacts(gLv2World.new_uri("http://lv2plug.in/ns/dev/extportinfo#causesArtifacts")); @@ -741,47 +741,47 @@ const LV2_RDF_Descriptor* lv2_rdf_new(const LV2_URI uri, const bool fillPresets if (lilvPort.has_property(oldPropArtifacts)) { rdfPort->Properties |= LV2_PORT_CAUSES_ARTIFACTS; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'causesArtifacts'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'causesArtifacts'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropContinuousCV)) { rdfPort->Properties |= LV2_PORT_CONTINUOUS_CV; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'continuousCV'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'continuousCV'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropDiscreteCV)) { rdfPort->Properties |= LV2_PORT_DISCRETE_CV; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'discreteCV'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'discreteCV'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropExpensive)) { rdfPort->Properties |= LV2_PORT_EXPENSIVE; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'expensive'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'expensive'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropStrictBounds)) { rdfPort->Properties |= LV2_PORT_STRICT_BOUNDS; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'hasStrictBounds'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'hasStrictBounds'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropLogarithmic)) { rdfPort->Properties |= LV2_PORT_LOGARITHMIC; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'logarithmic'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'logarithmic'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropNotAutomatic)) { rdfPort->Properties |= LV2_PORT_NOT_AUTOMATIC; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'notAutomatic'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'notAutomatic'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropNotOnGUI)) { rdfPort->Properties |= LV2_PORT_NOT_ON_GUI; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'notOnGUI'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'notOnGUI'", uri, rdfPort->Name); } if (lilvPort.has_property(oldPropTrigger)) { rdfPort->Properties |= LV2_PORT_TRIGGER; - carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/broken LV2 property for 'trigger'", uri, rdfPort->Name); + carla_stderr("lv2_rdf_new(\"%s\") - port '%s' uses old/invalid LV2 property for 'trigger'", uri, rdfPort->Name); } } } diff --git a/source/widgets/Makefile b/source/widgets/Makefile index a3c30d2cb..24ed0a7c9 100644 --- a/source/widgets/Makefile +++ b/source/widgets/Makefile @@ -18,6 +18,8 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) endif +# -------------------------------------------------------------- + FILES = \ moc_paramspinbox.cpp \ moc_pixmapkeyboard.cpp @@ -38,7 +40,7 @@ TARGET = ../libs/widgets.a all: $(TARGET) clean: - rm -f $(FILES) $(OBJS) $(TARGET) + rm -f $(FILES) $(TARGET) $(OBJS) debug: $(MAKE) DEBUG=true