External, Non-PPA KXStudio Repository
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

45 lines
4.3KB

  1. diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile
  2. index 96ff38d2e..91729d424 100644
  3. --- a/extras/Projucer/Builds/LinuxMakefile/Makefile
  4. +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile
  5. @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release)
  6. TARGET_ARCH :=
  7. endif
  8. - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-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=6.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS)
  9. + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-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=6.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS)
  10. 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"
  11. JUCE_TARGET_APP := Projucer
  12. diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h
  13. index b84d91da6..0ae17c508 100644
  14. --- a/extras/Projucer/Source/Project/jucer_Project.h
  15. +++ b/extras/Projucer/Source/Project/jucer_Project.h
  16. @@ -161,7 +161,7 @@ public:
  17. static String getPluginDefinesFilename() { return "JucePluginDefines.h"; }
  18. static String getJuceSourceHFilename() { return "JuceHeader.h"; }
  19. static String getJuceLV2DefinesFilename() { return "JuceLV2Defines.h"; }
  20. - static String getLV2FileWriterName() { return "juce_lv2_helper"; }
  21. + static String getLV2FileWriterName() { return "juce7_lv2_helper"; }
  22. //==============================================================================
  23. template <class FileType>
  24. diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
  25. index b5608a7..8e77343 100644
  26. --- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
  27. +++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
  28. @@ -358,11 +358,11 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os)
  29. {
  30. if (key == Ids::jucePath)
  31. {
  32. - return (os == TargetOS::windows ? "C:\\JUCE" : "~/JUCE");
  33. + return (os == TargetOS::windows ? "C:\\JUCE" : "/opt/kxstudio/include/JUCE-6.1.6");
  34. }
  35. else if (key == Ids::defaultJuceModulePath)
  36. {
  37. - return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules");
  38. + return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/opt/kxstudio/include/JUCE-6.1.6/modules");
  39. }
  40. else if (key == Ids::defaultUserModulePath)
  41. {