Fix build for non-linux

source/Makefile.mk

@@ -103,6 +103,8 @@ endif
 # Check for optional libs (required by backend or bridges)
 
 HAVE_FFMPEG       = $(shell pkg-config --exists libavcodec libavformat libavutil && pkg-config --max-version=1.9 libavcodec && echo true)
+HAVE_QT4          = $(shell pkg-config --exists QtCore QtGui && echo true)
+HAVE_QT5          = $(shell pkg-config --exists Qt5Core Qt5Gui Qt5Widgets && echo true)
 
 ifeq ($(LINUX),true)
 HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
@@ -110,8 +112,6 @@ HAVE_GTK2         = $(shell pkg-config --exists gtk+-2.0 && echo true)
 HAVE_GTK3         = $(shell pkg-config --exists gtk+-3.0 && echo true)
 HAVE_OPENGL       = $(shell pkg-config --exists gl && echo true)
 HAVE_PULSEAUDIO   = $(shell pkg-config --exists libpulse-simple && echo true)
-HAVE_QT4          = $(shell pkg-config --exists QtCore QtGui && echo true)
-HAVE_QT5          = $(shell pkg-config --exists Qt5Core Qt5Gui Qt5Widgets && echo true)
 else
 HAVE_OPENGL       = true
 endif

source/carla

@@ -19,9 +19,6 @@
 # ------------------------------------------------------------------------------------------------------------
 # Imports (Global)
 
-#try:
-    #from PyQt5.QtWidgets import QLabel, QTabWidget
-#except:
 from PyQt4.QtGui import QLabel, QTabWidget
 
 # ------------------------------------------------------------------------------------------------------------
@@ -178,6 +175,10 @@ class CarlaHostW(HostWindow):
         self.fInfoLabel.setAlignment(Qt.AlignRight|Qt.AlignVCenter)
         self.fInfoLabel.setText("Engine stopped")
 
+        if MACOS and False: # TODO: check if NOT using pro theme
+            self.fInfoLabel.hide()
+            self.setUnifiedTitleAndToolBarOnMac(True)
+
         # -------------------------------------------------------------
 
         self.ui.act_settings_show_toolbar.triggered.connect(self.slot_toolbarShown)

source/carla_settings.py

@@ -19,11 +19,6 @@
 # ------------------------------------------------------------------------------------------------------------
 # Imports (Global)
 
-#try:
-    #from PyQt5.QtCore import pyqtSlot, QByteArray, QSettings
-    #from PyQt5.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath
-    #from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFrame, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget
-#except:
 from PyQt4.QtCore import pyqtSlot, QByteArray, QSettings
 from PyQt4.QtGui import QColor, QCursor, QFontMetrics, QPainter, QPainterPath
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QFrame, QInputDialog, QLineEdit, QMenu, QVBoxLayout, QWidget

source/carla_shared.py

@@ -46,7 +46,7 @@ from carla_backend import *
 # Platform specific stuff
 
 if MACOS:
-    from PyQt5.QtGui import qt_mac_set_menubar_icons
+    from PyQt4.QtGui import qt_mac_set_menubar_icons
     qt_mac_set_menubar_icons(False)
 elif WINDOWS:
     WINDIR = os.getenv("WINDIR")

source/plugin/Makefile

@@ -152,7 +152,11 @@ carla-native-lv2-export.cpp.o: carla-native-lv2-export.cpp carla-native-base.cpp
 # --------------------------------------------------------------
 
 carla-native-lv2-export: carla-native-lv2-export.cpp.o $(LIBS)
+ifneq ($(MACOS),true)
 	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group $(LINK_FLAGS) -o $@
+else
+	$(CXX) $< $(LIBS) $(LINK_FLAGS) -o $@
+endif
 	./carla-native-lv2-export
 
 carla-native-lv2-export.exe: carla-native-lv2-export.cpp.o $(LIBS)