Browse Source

Tweaks for getting everything building with legacy juce

Signed-off-by: falkTX <falktx@falktx.com>
tags/2020-07-14
falkTX 3 years ago
parent
commit
d5e85bd5b6
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
15 changed files with 33 additions and 32 deletions
  1. +1
    -1
      Makefile
  2. +1
    -1
      libs/drowaudio/build-drowaudio/AppConfig.h
  3. +2
    -2
      libs/drowaudio/build-drowaudio/premake.lua
  4. +2
    -2
      libs/juce-legacy/Makefile
  5. +0
    -0
      libs/juce-legacy/build-juce-legacy/AppConfig.h
  6. +1
    -1
      libs/juce-legacy/build-juce-legacy/premake.lua
  7. +0
    -1
      libs/juce-plugin/AppConfig.h
  8. +1
    -0
      libs/juce-plugin/juce-legacy/AppConfig.h
  9. +1
    -1
      libs/juced/build-juced/AppConfig.h
  10. +2
    -2
      libs/juced/build-juced/premake.lua
  11. +1
    -1
      libs/juced/source/juced.cpp
  12. +11
    -11
      libs/juced/source/juced.h
  13. +1
    -1
      ports-legacy/Makefile
  14. +1
    -1
      ports/Makefile
  15. +8
    -7
      scripts/make-project.lua

+ 1
- 1
Makefile View File

@@ -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

# -----------------------------------------


+ 1
- 1
libs/drowaudio/build-drowaudio/AppConfig.h View File

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

+ 2
- 2
libs/drowaudio/build-drowaudio/premake.lua View File

@@ -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 = {


+ 2
- 2
libs/juce-legacy/Makefile View File

@@ -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/AppConfig.h → libs/juce-legacy/build-juce-legacy/AppConfig.h View File


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

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

+ 0
- 1
libs/juce-plugin/AppConfig.h View File

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

+ 1
- 0
libs/juce-plugin/juce-legacy/AppConfig.h View File

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

+ 1
- 1
libs/juced/build-juced/AppConfig.h View File

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

+ 2
- 2
libs/juced/build-juced/premake.lua View File

@@ -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 = {


+ 1
- 1
libs/juced/source/juced.cpp View File

@@ -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


+ 11
- 11
libs/juced/source/juced.h View File

@@ -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 }


+ 1
- 1
ports-legacy/Makefile View File

@@ -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



+ 1
- 1
ports/Makefile View File

@@ -9,7 +9,7 @@ plugins: lv2 vst
# libs

libs:
$(MAKE) -C ../libs/juce
# $(MAKE) -C ../libs/juce
$(MAKE) -C ../libs/lv2-ttl-generator

# -----------------------------------------


+ 8
- 7
scripts/make-project.lua View File

@@ -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,


Loading…
Cancel
Save