|
|
@@ -1,7 +1,7 @@ |
|
|
diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h |
|
|
|
|
|
index d258d34..fbd3c88 100644 |
|
|
|
|
|
--- a/extras/Projucer/Source/Project/jucer_Project.h |
|
|
|
|
|
+++ b/extras/Projucer/Source/Project/jucer_Project.h |
|
|
|
|
|
|
|
|
diff --git b/extras/Projucer/Source/Project/jucer_Project.h a/extras/Projucer/Source/Project/jucer_Project.h |
|
|
|
|
|
index 1a67d03..e0da4d8 100644 |
|
|
|
|
|
--- b/extras/Projucer/Source/Project/jucer_Project.h |
|
|
|
|
|
+++ a/extras/Projucer/Source/Project/jucer_Project.h |
|
|
@@ -221,8 +221,8 @@ public: |
|
|
@@ -221,8 +221,8 @@ public: |
|
|
static String getPluginDefinesFilename() { return "JucePluginDefines.h"; }
|
|
|
static String getPluginDefinesFilename() { return "JucePluginDefines.h"; }
|
|
|
static String getJuceSourceHFilename() { return "JuceHeader.h"; }
|
|
|
static String getJuceSourceHFilename() { return "JuceHeader.h"; }
|
|
|
@@ -13,43 +13,21 @@ index d258d34..fbd3c88 100644 |
|
|
|
|
|
|
|
|
//==============================================================================
|
|
|
//==============================================================================
|
|
|
template <class FileType>
|
|
|
template <class FileType>
|
|
|
diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
|
|
|
index ba1a2ab..4a32d20 100644 |
|
|
|
|
|
--- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
|
|
|
+++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
|
|
|
|
|
|
diff --git b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
|
|
|
index ba1a2ab..f9c7986 100644 |
|
|
|
|
|
--- b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
|
|
|
+++ a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp |
|
|
@@ -348,11 +348,11 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) |
|
|
@@ -348,11 +348,11 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) |
|
|
{
|
|
|
{
|
|
|
if (key == Ids::jucePath)
|
|
|
if (key == Ids::jucePath)
|
|
|
{
|
|
|
{
|
|
|
- return (os == TargetOS::windows ? "C:\\JUCE" : "~/JUCE");
|
|
|
- return (os == TargetOS::windows ? "C:\\JUCE" : "~/JUCE");
|
|
|
+ return (os == TargetOS::windows ? "C:\\JUCE" : "/opt/kxstudio/include/JUCE-7.0.9");
|
|
|
|
|
|
|
|
|
+ return (os == TargetOS::windows ? "C:\\JUCE" : "/opt/kxstudio/include/JUCE-7.0.12");
|
|
|
}
|
|
|
}
|
|
|
else if (key == Ids::defaultJuceModulePath)
|
|
|
else if (key == Ids::defaultJuceModulePath)
|
|
|
{
|
|
|
{
|
|
|
- return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules");
|
|
|
- return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules");
|
|
|
+ return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/opt/kxstudio/include/JUCE-7.0.9/modules");
|
|
|
|
|
|
|
|
|
+ return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/opt/kxstudio/include/JUCE-7.0.12/modules");
|
|
|
}
|
|
|
}
|
|
|
else if (key == Ids::defaultUserModulePath)
|
|
|
else if (key == Ids::defaultUserModulePath)
|
|
|
{
|
|
|
{
|
|
|
diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile |
|
|
|
|
|
index 2dbf595..8f2444e 100644 |
|
|
|
|
|
--- a/extras/Projucer/Builds/LinuxMakefile/Makefile |
|
|
|
|
|
+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile |
|
|
|
|
|
@@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) |
|
|
|
|
|
TARGET_ARCH := |
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|
- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) |
|
|
|
|
|
+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=0" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) |
|
|
|
|
|
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" |
|
|
|
|
|
JUCE_TARGET_APP := Projucer |
|
|
|
|
|
|
|
|
|
|
|
@@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) |
|
|
|
|
|
TARGET_ARCH := |
|
|
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|
- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) |
|
|
|
|
|
+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x70009" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=0" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=7.0.9" "-DJUCE_APP_VERSION_HEX=0x70009" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) |
|
|
|
|
|
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" |
|
|
|
|
|
JUCE_TARGET_APP := Projucer |
|
|
|
|
|
|
|
|
|