More fixes for non-gnu systems

source/Makefile.mk

@@ -265,11 +265,11 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set PyQt tools
 
-PYRCC4 ?= $(shell which pyrcc4)
-PYUIC4 ?= $(shell which pyuic4)
+PYRCC4 ?= $(shell which pyrcc4 2>/dev/null)
+PYUIC4 ?= $(shell which pyuic4 2>/dev/null)
 
-PYRCC5 ?= $(shell which pyrcc5)
-PYUIC5 ?= $(shell which pyuic5)
+PYRCC5 ?= $(shell which pyrcc5 2>/dev/null)
+PYUIC5 ?= $(shell which pyuic5 2>/dev/null)
 
 HAVE_PYQT4=false
 HAVE_PYQT5=false

source/jackbridge/JackBridge.hpp

@@ -31,7 +31,7 @@
 
 #include "CarlaDefines.h"
 
-#ifdef __cdecl
+#if defined(CARLA_OS_WIN) && defined(__cdecl)
 # define JACKBRIDGE_API __cdecl
 #else
 # define JACKBRIDGE_API

source/utils/CarlaVstUtils.hpp

@@ -23,13 +23,6 @@
 // -----------------------------------------------------------------------
 // Include fixes
 
-// Define __cdecl if needed
-#ifndef CARLA_OS_WIN
-# ifndef __cdecl
-#  define __cdecl
-# endif
-#endif
-
 // Disable deprecated VST features (NOT)
 #define VST_2_4_EXTENSIONS 1
 #define VST_FORCE_DEPRECATED 0
@@ -105,7 +98,11 @@
 #define kVstTransportChanged 1
 #define kVstVersion 2400
 #define DECLARE_VST_DEPRECATED(idx) idx
-#define VSTCALLBACK __cdecl
+#if defined(CARLA_OS_WIN) && defined(__cdecl)
+# define VSTCALLBACK __cdecl
+#else
+# define VSTCALLBACK
+#endif
 struct ERect {
     int16_t top, left, bottom, right;
 };