Misc fixing

Makefile

@@ -71,12 +71,12 @@ win64:
 	$(MAKE) -C source/discovery win64
 
 wine32:
-	$(MAKE) -C source/libs jackbridge-wine32
-	$(LINK) ../libs/jackbridge-win32.dll.so source/bridges/jackbridge-win32.dll
+	$(MAKE) -C source/modules jackbridge-wine32
+	$(LINK) ../modules/jackbridge-win32.dll.so source/bridges/jackbridge-win32.dll
 
 wine64:
-	$(MAKE) -C source/libs jackbridge-wine64
-	$(LINK) ../libs/jackbridge-win64.dll.so source/bridges/jackbridge-win64.dll
+	$(MAKE) -C source/modules jackbridge-wine64
+	$(LINK) ../modules/jackbridge-win64.dll.so source/bridges/jackbridge-win64.dll
 
 # --------------------------------------------------------------
 # Resources

source/backend/standalone/CarlaStandalone.cpp

@@ -420,10 +420,10 @@ bool carla_engine_init(const char* driverName, const char* clientName)
     if (gStandalone.engineOptions.audioDevice != nullptr)
         gStandalone.engine->setOption(CB::ENGINE_OPTION_AUDIO_DEVICE,   0, gStandalone.engineOptions.audioDevice);
 
-    if (gStandalone.engineOptions.binaryDir != nullptr)
+    if (gStandalone.engineOptions.binaryDir != nullptr && gStandalone.engineOptions.binaryDir[0] != '\0')
         gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_BINARIES,  0, gStandalone.engineOptions.binaryDir);
 
-    if (gStandalone.engineOptions.resourceDir != nullptr)
+    if (gStandalone.engineOptions.resourceDir != nullptr && gStandalone.engineOptions.resourceDir[0] != '\0')
         gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_RESOURCES, 0, gStandalone.engineOptions.resourceDir);
 
     if (gStandalone.engineOptions.frontendWinId != 0)

source/modules/Makefile

@@ -142,18 +142,18 @@ jackbridge:
 jackbridge-win32:
 	$(MAKE) -C jackbridge win32
 
-jackbridge-win32e:
-	$(MAKE) -C jackbridge win32e
-
 jackbridge-win64:
 	$(MAKE) -C jackbridge win64
 
-jackbridge-wine32:
-	$(MAKE) -C jackbridge wine32
+jackbridge-win32e:
+	$(MAKE) -C jackbridge win32e
 
 jackbridge-win64e:
 	$(MAKE) -C jackbridge win64e
 
+jackbridge-wine32:
+	$(MAKE) -C jackbridge wine32
+
 jackbridge-wine64:
 	$(MAKE) -C jackbridge wine64