| @@ -233,8 +233,6 @@ private: | |||||
| builder.add (new FilePathPropertyComponent (androidSDKPathValue, "Android SDK", true, isThisOS), | builder.add (new FilePathPropertyComponent (androidSDKPathValue, "Android SDK", true, isThisOS), | ||||
| "This path will be used when writing the local.properties file of an Android project and should point to the Android SDK folder."); | "This path will be used when writing the local.properties file of an Android project and should point to the Android SDK folder."); | ||||
| builder.add (new FilePathPropertyComponent (androidNDKPathValue, "Android NDK", true, isThisOS), | |||||
| "This path will be used when writing the local.properties file of an Android project and should point to the Android NDK folder."); | |||||
| if (isThisOS) | if (isThisOS) | ||||
| { | { | ||||
| @@ -273,7 +271,6 @@ private: | |||||
| rtasPathValue = settings.getStoredPath (Ids::rtasPath, os); | rtasPathValue = settings.getStoredPath (Ids::rtasPath, os); | ||||
| aaxPathValue = settings.getStoredPath (Ids::aaxPath, os); | aaxPathValue = settings.getStoredPath (Ids::aaxPath, os); | ||||
| androidSDKPathValue = settings.getStoredPath (Ids::androidSDKPath, os); | androidSDKPathValue = settings.getStoredPath (Ids::androidSDKPath, os); | ||||
| androidNDKPathValue = settings.getStoredPath (Ids::androidNDKPath, os); | |||||
| clionExePathValue = settings.getStoredPath (Ids::clionExePath, os); | clionExePathValue = settings.getStoredPath (Ids::clionExePath, os); | ||||
| androidStudioExePathValue = settings.getStoredPath (Ids::androidStudioExePath, os); | androidStudioExePathValue = settings.getStoredPath (Ids::androidStudioExePath, os); | ||||
| } | } | ||||
| @@ -287,7 +284,6 @@ private: | |||||
| rtasPathValue .resetToDefault(); | rtasPathValue .resetToDefault(); | ||||
| aaxPathValue .resetToDefault(); | aaxPathValue .resetToDefault(); | ||||
| androidSDKPathValue .resetToDefault(); | androidSDKPathValue .resetToDefault(); | ||||
| androidNDKPathValue .resetToDefault(); | |||||
| clionExePathValue .resetToDefault(); | clionExePathValue .resetToDefault(); | ||||
| androidStudioExePathValue.resetToDefault(); | androidStudioExePathValue.resetToDefault(); | ||||
| @@ -298,8 +294,7 @@ private: | |||||
| Value selectedOSValue; | Value selectedOSValue; | ||||
| ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue, | ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue, | ||||
| vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, androidNDKPathValue, | |||||
| clionExePathValue, androidStudioExePathValue; | |||||
| vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, clionExePathValue, androidStudioExePathValue; | |||||
| Viewport propertyViewport; | Viewport propertyViewport; | ||||
| PropertyGroupComponent propertyGroup { "Global Paths", { getIcons().openFolder, Colours::transparentBlack } }; | PropertyGroupComponent propertyGroup { "Global Paths", { getIcons().openFolder, Colours::transparentBlack } }; | ||||
| @@ -711,7 +711,7 @@ namespace | |||||
| static bool isValidPathIdentifier (const String& id, const String& os) | static bool isValidPathIdentifier (const String& id, const String& os) | ||||
| { | { | ||||
| return id == "vstLegacyPath" || (id == "aaxPath" && os != "linux") || (id == "rtasPath" && os != "linux") | return id == "vstLegacyPath" || (id == "aaxPath" && os != "linux") || (id == "rtasPath" && os != "linux") | ||||
| || id == "androidSDKPath" || id == "androidNDKPath" || id == "defaultJuceModulePath" || id == "defaultUserModulePath"; | |||||
| || id == "androidSDKPath" || id == "defaultJuceModulePath" || id == "defaultUserModulePath"; | |||||
| } | } | ||||
| static void setGlobalPath (const ArgumentList& args) | static void setGlobalPath (const ArgumentList& args) | ||||
| @@ -872,7 +872,7 @@ namespace | |||||
| << std::endl | << std::endl | ||||
| << " " << appName << " --set-global-search-path os identifier_to_set new_path" << std::endl | << " " << appName << " --set-global-search-path os identifier_to_set new_path" << std::endl | ||||
| << " Sets the global path for a specified os and identifier. The os should be either osx, windows or linux and the identifiers can be any of the following: " | << " Sets the global path for a specified os and identifier. The os should be either osx, windows or linux and the identifiers can be any of the following: " | ||||
| << "defaultJuceModulePath, defaultUserModulePath, vstLegacyPath, aaxPath (not valid on linux), rtasPath (not valid on linux), androidSDKPath or androidNDKPath. " << std::endl | |||||
| << "defaultJuceModulePath, defaultUserModulePath, vstLegacyPath, aaxPath (not valid on linux), rtasPath (not valid on linux), or androidSDKPath. " << std::endl | |||||
| << std::endl | << std::endl | ||||
| << " " << appName << " --create-project-from-pip path/to/PIP path/to/output path/to/JUCE/modules (optional) path/to/user/modules (optional)" << std::endl | << " " << appName << " --create-project-from-pip path/to/PIP path/to/output path/to/JUCE/modules (optional) path/to/user/modules (optional)" << std::endl | ||||
| << " Generates a folder containing a JUCE project in the specified output path using the specified PIP file. Use the optional JUCE and user module paths to override " | << " Generates a folder containing a JUCE project in the specified output path using the specified PIP file. Use the optional JUCE and user module paths to override " | ||||
| @@ -997,8 +997,7 @@ private: | |||||
| { | { | ||||
| String props; | String props; | ||||
| props << "ndk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidNDKPath, TargetOS::getThisOS()).get().toString()) << newLine | |||||
| << "sdk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidSDKPath, TargetOS::getThisOS()).get().toString()) << newLine; | |||||
| props << "sdk.dir=" << sanitisePath (getAppSettings().getStoredPath (Ids::androidSDKPath, TargetOS::getThisOS()).get().toString()) << newLine; | |||||
| return replaceLineFeeds (props, getNewLineString()); | return replaceLineFeeds (props, getNewLineString()); | ||||
| } | } | ||||
| @@ -295,14 +295,6 @@ static bool isGlobalPathValid (const File& relativeTo, const Identifier& key, co | |||||
| fileToCheckFor = "platform-tools/adb"; | fileToCheckFor = "platform-tools/adb"; | ||||
| #endif | #endif | ||||
| } | } | ||||
| else if (key == Ids::androidNDKPath) | |||||
| { | |||||
| #if JUCE_WINDOWS | |||||
| fileToCheckFor = "ndk-depends.cmd"; | |||||
| #else | |||||
| fileToCheckFor = "ndk-depends"; | |||||
| #endif | |||||
| } | |||||
| else if (key == Ids::defaultJuceModulePath) | else if (key == Ids::defaultJuceModulePath) | ||||
| { | { | ||||
| fileToCheckFor = "juce_core"; | fileToCheckFor = "juce_core"; | ||||
| @@ -401,10 +393,6 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) | |||||
| jassertfalse; | jassertfalse; | ||||
| return {}; | return {}; | ||||
| } | } | ||||
| else if (key == Ids::androidNDKPath) | |||||
| { | |||||
| return getFallbackPathForOS (Ids::androidSDKPath, os) + File::getSeparatorChar() + "ndk-bundle"; | |||||
| } | |||||
| else if (key == Ids::clionExePath) | else if (key == Ids::clionExePath) | ||||
| { | { | ||||
| if (os == TargetOS::windows) | if (os == TargetOS::windows) | ||||
| @@ -216,7 +216,6 @@ namespace Ids | |||||
| DECLARE_ID (androidCustomApplicationClass); | DECLARE_ID (androidCustomApplicationClass); | ||||
| DECLARE_ID (androidVersionCode); | DECLARE_ID (androidVersionCode); | ||||
| DECLARE_ID (androidSDKPath); | DECLARE_ID (androidSDKPath); | ||||
| DECLARE_ID (androidNDKPath); | |||||
| DECLARE_ID (androidOboeRepositoryPath); | DECLARE_ID (androidOboeRepositoryPath); | ||||
| DECLARE_ID (androidInternetNeeded); | DECLARE_ID (androidInternetNeeded); | ||||
| DECLARE_ID (androidArchitectures); | DECLARE_ID (androidArchitectures); | ||||