74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
|
diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
|
||
|
|
index 3a9373893..6e1599345 100644
|
||
|
|
--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
|
||
|
|
+++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
|
||
|
|
@@ -86,7 +86,7 @@
|
||
|
|
//-----------------------------------------------------------------------------
|
||
|
|
// LINUX
|
||
|
|
//-----------------------------------------------------------------------------
|
||
|
|
-#elif __gnu_linux__
|
||
|
|
+#elif __linux__
|
||
|
|
#define SMTG_OS_LINUX 1
|
||
|
|
#define SMTG_OS_MACOS 0
|
||
|
|
#define SMTG_OS_WINDOWS 0
|
||
|
|
diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
|
||
|
|
index 914cae680..4b1f20b00 100644
|
||
|
|
--- a/source/modules/juce_core/juce_core.cpp
|
||
|
|
+++ b/source/modules/juce_core/juce_core.cpp
|
||
|
|
@@ -90,10 +90,6 @@
|
||
|
|
#include <sys/time.h>
|
||
|
|
#include <net/if.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
-
|
||
|
|
- #if ! JUCE_ANDROID
|
||
|
|
- #include <execinfo.h>
|
||
|
|
- #endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if JUCE_MAC || JUCE_IOS
|
||
|
|
diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
|
||
|
|
index cd3068e6e..607ed29c0 100644
|
||
|
|
--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
|
||
|
|
+++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
|
||
|
|
@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
|
||
|
|
return result;
|
||
|
|
}
|
||
|
|
|
||
|
|
-String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
|
||
|
|
-String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
|
||
|
|
+String SystemStats::getUserLanguage()
|
||
|
|
+{
|
||
|
|
+#if defined(_NL_IDENTIFICATION_LANGUAGE)
|
||
|
|
+ return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
|
||
|
|
+#else
|
||
|
|
+ return "";
|
||
|
|
+#endif
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+String SystemStats::getUserRegion()
|
||
|
|
+{
|
||
|
|
+#if defined(_NL_IDENTIFICATION_TERRITORY)
|
||
|
|
+ return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
|
||
|
|
+#else
|
||
|
|
+ return "";
|
||
|
|
+#endif
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
|
||
|
|
|
||
|
|
//==============================================================================
|
||
|
|
diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
|
||
|
|
index 847127162..815ead97c 100644
|
||
|
|
--- a/source/modules/juce_core/system/juce_SystemStats.cpp
|
||
|
|
+++ b/source/modules/juce_core/system/juce_SystemStats.cpp
|
||
|
|
@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
|
||
|
|
{
|
||
|
|
String result;
|
||
|
|
|
||
|
|
- #if JUCE_ANDROID || JUCE_MINGW
|
||
|
|
+// #if JUCE_ANDROID || JUCE_MINGW
|
||
|
|
+ #if 1
|
||
|
|
jassertfalse; // sorry, not implemented yet!
|
||
|
|
|
||
|
|
#elif JUCE_WINDOWS
|