Tweaks for getting everything building with legacy juce

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -14,7 +14,7 @@ all:
 	$(MAKE) -C libs/juce-legacy
 	$(MAKE) -C libs/juced
 	$(MAKE) -C libs/lv2-ttl-generator
-	$(MAKE) -C ports plugins
+	$(MAKE) -C ports-legacy plugins
 	$(MAKE) gen
 
 # -----------------------------------------

libs/drowaudio/build-drowaudio/AppConfig.h

@@ -1 +1 @@
-../../juce/build-juce/AppConfig.h
+../../juce-legacy/build-juce-legacy/AppConfig.h

libs/drowaudio/build-drowaudio/premake.lua

@@ -5,8 +5,8 @@ package = make_library_project("drowaudio")
 
 package.includepaths = {
   ".",
-  "../../juce/source",
-  "../../juce/source/modules"
+  "../../juce-legacy/source",
+  "../../juce-legacy/source/modules"
 }
 
 package.files = {

libs/juce-legacy/Makefile

@@ -1,10 +1,10 @@
 # Compile the juce shared lib
 
 all:
-	$(MAKE) -C build-juce
+	$(MAKE) -C build-juce-legacy
 
 clean:
-	$(MAKE) clean -C build-juce
+	$(MAKE) clean -C build-juce-legacy
 	rm -rf build-*/intermediate
 
 distclean: clean

libs/juce-legacy/build-juce/premake.lua → libs/juce-legacy/build-juce-legacy/premake.lua

@@ -1,7 +1,7 @@
 
 dofile("../../../scripts/make-project.lua")
 
-package = make_library_project("juce")
+package = make_library_project("juce-legacy")
 
 package.includepaths = {
   ".",

libs/juce-plugin/AppConfig.h

@@ -1 +0,0 @@
-../juce/build-juce/AppConfig.h

libs/juce-plugin/juce-legacy/AppConfig.h

@@ -0,0 +1 @@
+../../juce-legacy/build-juce-legacy/AppConfig.h

libs/juced/build-juced/AppConfig.h

@@ -1 +1 @@
-../../juce/build-juce/AppConfig.h
+../../juce-legacy/build-juce-legacy/AppConfig.h

libs/juced/build-juced/premake.lua

@@ -5,8 +5,8 @@ package = make_library_project("juced")
 
 package.includepaths = {
   ".",
-  "../../juce/source",
-  "../../juce/source/modules"
+  "../../juce-legacy/source",
+  "../../juce-legacy/source/modules"
 }
 
 package.files = {

libs/juced/source/juced.cpp

@@ -42,7 +42,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../juce/source/modules/juce_core/native/juce_BasicNativeHeaders.h"
+#include "../../juce-legacy/source/modules/juce_core/native/juce_BasicNativeHeaders.h"
 #include "juced.h"
 
 // START_AUTOINCLUDE

libs/juced/source/juced.h

@@ -26,17 +26,17 @@
 #ifndef __JUCED_JUCEHEADER__
 #define __JUCED_JUCEHEADER__
 
-#include "../../juce/source/modules/juce_audio_basics/juce_audio_basics.h"
-#include "../../juce/source/modules/juce_audio_devices/juce_audio_devices.h"
-#include "../../juce/source/modules/juce_audio_formats/juce_audio_formats.h"
-#include "../../juce/source/modules/juce_audio_processors/juce_audio_processors.h"
-#include "../../juce/source/modules/juce_audio_utils/juce_audio_utils.h"
-#include "../../juce/source/modules/juce_core/juce_core.h"
-#include "../../juce/source/modules/juce_data_structures/juce_data_structures.h"
-#include "../../juce/source/modules/juce_events/juce_events.h"
-#include "../../juce/source/modules/juce_graphics/juce_graphics.h"
-#include "../../juce/source/modules/juce_gui_basics/juce_gui_basics.h"
-#include "../../juce/source/modules/juce_gui_extra/juce_gui_extra.h"
+#include "../../juce-legacy/source/modules/juce_audio_basics/juce_audio_basics.h"
+#include "../../juce-legacy/source/modules/juce_audio_devices/juce_audio_devices.h"
+#include "../../juce-legacy/source/modules/juce_audio_formats/juce_audio_formats.h"
+#include "../../juce-legacy/source/modules/juce_audio_processors/juce_audio_processors.h"
+#include "../../juce-legacy/source/modules/juce_audio_utils/juce_audio_utils.h"
+#include "../../juce-legacy/source/modules/juce_core/juce_core.h"
+#include "../../juce-legacy/source/modules/juce_data_structures/juce_data_structures.h"
+#include "../../juce-legacy/source/modules/juce_events/juce_events.h"
+#include "../../juce-legacy/source/modules/juce_graphics/juce_graphics.h"
+#include "../../juce-legacy/source/modules/juce_gui_basics/juce_gui_basics.h"
+#include "../../juce-legacy/source/modules/juce_gui_extra/juce_gui_extra.h"
 
 #define BEGIN_JUCE_NAMESPACE namespace juce {
 #define END_JUCE_NAMESPACE }

ports-legacy/Makefile

@@ -10,7 +10,7 @@ plugins: lv2 vst
 
 libs:
 	$(MAKE) -C ../libs/drowaudio
-	$(MAKE) -C ../libs/juce
+	$(MAKE) -C ../libs/juce-legacy
 	$(MAKE) -C ../libs/juced
 	$(MAKE) -C ../libs/lv2-ttl-generator
 

ports/Makefile

@@ -9,7 +9,7 @@ plugins: lv2 vst
 # libs
 
 libs:
-	$(MAKE) -C ../libs/juce
+# 	$(MAKE) -C ../libs/juce
 	$(MAKE) -C ../libs/lv2-ttl-generator
 
 # -----------------------------------------

scripts/make-project.lua

@@ -119,11 +119,12 @@ function make_plugin_project(name, spec)
 
   package.includepaths = {
     "../source",
-    "../../../libs/juce/source",
-    "../../../libs/juce/source/modules",
     "../../../libs/drowaudio/source",
     "../../../libs/juced/source",
-    "../../../libs/juce-plugin"
+    "../../../libs/juce-legacy/source",
+    "../../../libs/juce-legacy/source/modules",
+    "../../../libs/juce-plugin",
+    "../../../libs/juce-plugin/juce-legacy"
   }
 
   package.libpaths = {
@@ -155,8 +156,8 @@ end
 function make_juce_lv2_project(name)
   package = make_plugin_project(name, "LV2")
 
-  package.config["Release"].links = { "juce" }
-  package.config["Debug"].links   = { "juce_debug" }
+  package.config["Release"].links = { "juce-legacy" }
+  package.config["Debug"].links   = { "juce-legacy_debug" }
 
   if (windows) then
     package.links       = { "comdlg32", "gdi32", "imm32", "ole32", "oleaut32", "shlwapi", "uuid", "version", "winmm", "wininet", "ws2_32" }
@@ -183,8 +184,8 @@ end
 function make_juce_vst_project(name)
   package = make_plugin_project(name, "VST")
 
-  package.config["Release"].links = { "juce" }
-  package.config["Debug"].links   = { "juce_debug" }
+  package.config["Release"].links = { "juce-legacy" }
+  package.config["Debug"].links   = { "juce-legacy_debug" }
 
   package.buildoptions = {
     package.buildoptions,