Cleanup

Makefile

@@ -50,6 +50,9 @@ ALL_LIBS += source/modules/juce_events.a
 ALL_LIBS += source/modules/juce_graphics.a
 ALL_LIBS += source/modules/juce_gui_basics.a
 ALL_LIBS += source/modules/juce_gui_extra.a
+else
+ALL_LIBS += source/modules/rtaudio.a
+ALL_LIBS += source/modules/rtmidi.a
 endif
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
@@ -57,9 +60,7 @@ ALL_LIBS += source/modules/lilv.a
 endif
 
 ALL_LIBS += source/modules/native-plugins.a
-ALL_LIBS += source/modules/rtaudio.a
 ALL_LIBS += source/modules/rtmempool.a
-ALL_LIBS += source/modules/rtmidi.a
 
 ifeq ($(HAVE_QT4),true)
 ALL_LIBS += source/modules/theme.qt4.a

source/Makefile.mk

@@ -281,10 +281,6 @@ JUCE_GRAPHICS_LIBS         = -framework Cocoa -framework QuartzCore
 JUCE_GUI_BASICS_LIBS       = -framework Cocoa
 JUCE_GUI_EXTRA_LIBS        = -framework Cocoa -framework IOKit
 LILV_LIBS                  = -ldl -lm
-RTAUDIO_FLAGS             += -D__MACOSX_CORE__
-RTAUDIO_LIBS              += -framework CoreAudio -framework CoreFoundation -lpthread
-RTMIDI_FLAGS              += -D__MACOSX_CORE__
-RTMIDI_LIBS               += -framework CoreAudio -framework CoreMIDI -framework CoreFoundation
 endif
 
 ifeq ($(WIN32),true)
@@ -295,9 +291,6 @@ JUCE_CORE_LIBS          = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32
 JUCE_GRAPHICS_LIBS      = -lgdi32
 JUCE_GUI_BASICS_LIBS    = -lgdi32 -limm32 -lcomdlg32 -lole32
 LILV_LIBS               = -lm
-RTAUDIO_FLAGS          += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__
-RTAUDIO_LIBS           += -ldsound -lpthread
-RTMIDI_FLAGS           += -D__WINDOWS_MM__
 endif
 
 # --------------------------------------------------------------

source/backend/Makefile

@@ -17,9 +17,7 @@ STANDALONE_LIBS += ../modules/juce_audio_basics.a
 STANDALONE_LIBS += ../modules/juce_audio_formats.a
 STANDALONE_LIBS += ../modules/juce_core.a
 STANDALONE_LIBS += ../modules/native-plugins.a
-STANDALONE_LIBS += ../modules/rtaudio.a
 STANDALONE_LIBS += ../modules/rtmempool.a
-STANDALONE_LIBS += ../modules/rtmidi.a
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 STANDALONE_LIBS += ../modules/lilv.a
@@ -33,6 +31,9 @@ STANDALONE_LIBS += ../modules/juce_events.a
 STANDALONE_LIBS += ../modules/juce_graphics.a
 STANDALONE_LIBS += ../modules/juce_gui_basics.a
 STANDALONE_LIBS += ../modules/juce_gui_extra.a
+else
+STANDALONE_LIBS += ../modules/rtaudio.a
+STANDALONE_LIBS += ../modules/rtmidi.a
 endif
 
 # --------------------------------------------------------------
@@ -43,9 +44,7 @@ STANDALONE_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_AUDIO_FORMATS_LIBS)
 STANDALONE_FLAGS += $(LIBLO_LIBS)
 STANDALONE_FLAGS += $(NATIVE_PLUGINS_LIBS)
-STANDALONE_FLAGS += $(RTAUDIO_LIBS)
 STANDALONE_FLAGS += $(RTMEMPOOL_LIBS)
-STANDALONE_FLAGS += $(RTMIDI_LIBS)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 STANDALONE_FLAGS += $(LILV_LIBS)
@@ -67,6 +66,9 @@ STANDALONE_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GRAPHICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
+else
+STANDALONE_FLAGS += $(RTAUDIO_LIBS)
+STANDALONE_FLAGS += $(RTMIDI_LIBS)
 endif
 
 ifeq ($(HAVE_X11),true)

source/tests/Makefile

@@ -115,12 +115,16 @@ CarlaMutex: CarlaMutex.cpp ../utils/CarlaMutex.hpp
 	$(CXX) $< -lpthread -o $@
 	valgrind --leak-check=full ./$@
 
+# ifneq ($(MACOS_OR_WIN32),true)
+# 	 ../modules/rtaudio.a ../modules/rtmidi.a \
+# endif
+
 Engine: Engine.cpp
 	$(CXX) $< \
 	../backend/standalone/CarlaStandalone.cpp.o \
 	-Wl,--start-group \
 	../backend/carla_engine.a ../backend/carla_plugin.a ../modules/native-plugins.a \
-	../modules/dgl.a ../modules/jackbridge.a ../modules/lilv.a ../modules/rtmempool.a ../modules/rtaudio.a ../modules/rtmidi.a \
+	../modules/dgl.a ../modules/jackbridge.a ../modules/lilv.a ../modules/rtmempool.a \
 	-Wl,--end-group \
 	$(PEDANTIC_CXX_FLAGS) $(shell pkg-config --libs alsa libpulse-simple liblo QtCore QtXml fluidsynth linuxsampler x11 gl smf fftw3 mxml zlib ntk_images ntk) -o $@
 	env LD_LIBRARY_PATH=../backend valgrind --leak-check=full ./$@

source/utils/CarlaShmUtils.hpp

@@ -203,7 +203,7 @@ void carla_shm_unmap(shm_t& shm, void* const ptr, const size_t size) noexcept
 
     try {
 #ifdef CARLA_OS_WIN
-        const Handle map = shm.map;
+        const HANDLE map = shm.map;
         shm.map = nullptr;
 
         ::UnmapViewOfFile(ptr);