more tweaks

source/Makefile.deps

@@ -27,8 +27,8 @@ CARLA_PLUGIN_HPP = $(CWD)/backend/CarlaPlugin.hpp $(CARLA_BACKEND_H)
 
 CARLA_UTILS_HPP      = $(CWD)/utils/CarlaUtils.hpp     $(CARLA_DEFINES_H)
 CARLA_JUCE_UTILS_HPP = $(CWD)/utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_MATH_UTILS_HPP = $(CWD)/utils/CarlaMathUtils.hpp $(CARLA_UTILS_HPP)
 CARLA_LIB_UTILS_HPP  = $(CWD)/utils/CarlaLibUtils.hpp  $(CARLA_UTILS_HPP)
+CARLA_MATH_UTILS_HPP = $(CWD)/utils/CarlaMathUtils.hpp $(CARLA_UTILS_HPP)
 CARLA_OSC_UTILS_HPP  = $(CWD)/utils/CarlaOscUtils.hpp  $(CARLA_UTILS_HPP)
 CARLA_SHM_UTILS_HPP  = $(CWD)/utils/CarlaShmUtils.hpp  $(CARLA_UTILS_HPP)
 

source/discovery/Makefile

@@ -4,6 +4,7 @@
 # Created by falkTX
 #
 
+CWD=..
 include ../Makefile.mk
 
 # --------------------------------------------------------------
@@ -21,8 +22,6 @@ endif
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -DWANT_NATIVE
-
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
 ifeq ($(MACOS),true)
@@ -72,12 +71,8 @@ LIBS_posix32 += ../modules/juce_core.posix32.a
 LIBS_posix64 += ../modules/juce_core.posix64.a
 LIBS_win32   += ../modules/juce_core.win32.a
 LIBS_win64   += ../modules/juce_core.win64.a
-LINK_FLAGS   += $(JUCE_CORE_LIBS) $(JUCE_AUDIO_BASICS_LIBS)
-endif
-
-ifeq ($(MACOS),true)
-LIBS         += ../modules/juce_gui_extra.a
-LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
+LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
+LINK_FLAGS   += $(JUCE_CORE_LIBS)
 endif
 
 ifeq ($(MACOS_OR_WIN32),true)
@@ -113,6 +108,11 @@ LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 endif
 
+ifeq ($(MACOS),true)
+LIBS         += ../modules/juce_gui_extra.a
+LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
+endif
+
 POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
 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
@@ -122,56 +122,52 @@ ifneq ($(HAIKU),true)
 POSIX_LINK_FLAGS += -ldl
 endif
 
-WIN_BUILD_FLAGS   = $(BUILD_CXX_FLAGS)
-WIN_32BIT_FLAGS   = $(32BIT_FLAGS)
-WIN_64BIT_FLAGS   = $(64BIT_FLAGS)
-WIN_LINK_FLAGS    = $(LINK_FLAGS) $(EXTRA_LIBS)
+WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
+WIN_32BIT_FLAGS = $(32BIT_FLAGS)
+WIN_64BIT_FLAGS = $(64BIT_FLAGS)
+WIN_LINK_FLAGS  = $(LINK_FLAGS) $(EXTRA_LIBS)
 
 # --------------------------------------------------------------
 
-DEPS  = ../includes/CarlaDefines.h
-DEPS += ../includes/CarlaMIDI.h
-DEPS += ../backend/CarlaBackend.h
-DEPS += ../utils/CarlaString.hpp
-DEPS += ../utils/CarlaUtils.hpp
-DEPS += ../utils/CarlaBackendUtils.hpp
-DEPS += ../utils/CarlaJuceUtils.hpp
-DEPS += ../utils/CarlaLibUtils.hpp
-DEPS += ../utils/CarlaMathUtils.hpp
-DEPS += ../utils/CarlaLadspaUtils.hpp
-DEPS += ../utils/CarlaDssiUtils.hpp
-DEPS += ../utils/CarlaLv2Utils.hpp
-DEPS += ../utils/CarlaVstUtils.hpp
+DEPS  = $(CARLA_BACKEND_UTILS_HPP)
+DEPS += $(CARLA_LIB_UTILS_HPP)
+DEPS += $(CARLA_MATH_UTILS_HPP)
+DEPS += $(CARLA_MIDI_H)
+# juce_audio_processors.h
+DEPS += $(CARLA_LADSPA_UTILS_HPP)
+DEPS += $(CARLA_DSSI_UTILS_CPP)
+DEPS += $(CARLA_LV2_UTILS_HPP)
+DEPS += $(CARLA_VST_UTILS_HPP)
 
 OBJS = carla-discovery.cpp
 
 # --------------------------------------------------------------
 
 all:     ../../bin/carla-discovery-native$(APP_EXT)
-posix32: ../../carla-discovery-posix32
-posix64: ../../carla-discovery-posix64
-win32:   ../../carla-discovery-win32.exe
-win64:   ../../carla-discovery-win64.exe
+posix32: ../../bin/carla-discovery-posix32
+posix64: ../../bin/carla-discovery-posix64
+win32:   ../../bin/carla-discovery-win32.exe
+win64:   ../../bin/carla-discovery-win64.exe
 
 # --------------------------------------------------------------
 
 ../../bin/carla-discovery-native: $(OBJS) $(DEPS) $(LIBS)
-	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(NATIVE_FLAGS) $(POSIX_LINK_FLAGS) -o $@
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(NATIVE_FLAGS) $(POSIX_LINK_FLAGS) -o $@
 
 ../../bin/carla-discovery-native.exe: $(OBJS) $(DEPS) $(LIBS)
-	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(WIN_BUILD_FLAGS) $(NATIVE_FLAGS) $(WIN_LINK_FLAGS) -o $@
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS) $(LIBS_END) $(WIN_BUILD_FLAGS) $(NATIVE_FLAGS) $(WIN_LINK_FLAGS) -o $@
 
-../../carla-discovery-posix32: $(OBJS) $(DEPS) $(LIBS_posix32)
-	$(CXX) $< $(LIBS_START) $(LIBS_posix32) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
+../../bin/carla-discovery-posix32: $(OBJS) $(DEPS) $(LIBS_posix32)
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS_posix32) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
 
-../../carla-discovery-posix64: $(OBJS) $(DEPS) $(LIBS_posix64)
-	$(CXX) $< $(LIBS_START) $(LIBS_posix64) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
+../../bin/carla-discovery-posix64: $(OBJS) $(DEPS) $(LIBS_posix64)
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS_posix64) $(LIBS_END) $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@
 
-../../carla-discovery-win32.exe: $(OBJS) $(DEPS) $(LIBS_win32)
-	$(CXX) $< $(LIBS_START) $(LIBS_win32) $(LIBS_END) $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
+../../bin/carla-discovery-win32.exe: $(OBJS) $(DEPS) $(LIBS_win32)
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS_win32) $(LIBS_END) $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
 
-../../carla-discovery-win64.exe: $(OBJS) $(DEPS) $(LIBS_win64)
-	$(CXX) $< $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
+../../bin/carla-discovery-win64.exe: $(OBJS) $(DEPS) $(LIBS_win64)
+	$(CXX) $(OBJS) $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
 

source/discovery/carla-discovery.cpp

@@ -67,7 +67,7 @@ CARLA_BACKEND_USE_NAMESPACE
 
 static const uint32_t kBufferSize  = 512;
 static const double   kSampleRate  = 44100.0;
-static const int32_t  kSampleRatei = 44100.0;
+static const int32_t  kSampleRatei = 44100;
 static const float    kSampleRatef = 44100.0f;
 
 // --------------------------------------------------------------------------