|
|
|
@@ -233,8 +233,6 @@ private: |
|
|
|
|
|
|
|
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.");
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
@@ -273,7 +271,6 @@ private: |
|
|
|
rtasPathValue = settings.getStoredPath (Ids::rtasPath, os);
|
|
|
|
aaxPathValue = settings.getStoredPath (Ids::aaxPath, os);
|
|
|
|
androidSDKPathValue = settings.getStoredPath (Ids::androidSDKPath, os);
|
|
|
|
androidNDKPathValue = settings.getStoredPath (Ids::androidNDKPath, os);
|
|
|
|
clionExePathValue = settings.getStoredPath (Ids::clionExePath, os);
|
|
|
|
androidStudioExePathValue = settings.getStoredPath (Ids::androidStudioExePath, os);
|
|
|
|
}
|
|
|
|
@@ -287,7 +284,6 @@ private: |
|
|
|
rtasPathValue .resetToDefault();
|
|
|
|
aaxPathValue .resetToDefault();
|
|
|
|
androidSDKPathValue .resetToDefault();
|
|
|
|
androidNDKPathValue .resetToDefault();
|
|
|
|
clionExePathValue .resetToDefault();
|
|
|
|
androidStudioExePathValue.resetToDefault();
|
|
|
|
|
|
|
|
@@ -298,8 +294,7 @@ private: |
|
|
|
Value selectedOSValue;
|
|
|
|
|
|
|
|
ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue,
|
|
|
|
vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, androidNDKPathValue,
|
|
|
|
clionExePathValue, androidStudioExePathValue;
|
|
|
|
vstPathValue, rtasPathValue, aaxPathValue, androidSDKPathValue, clionExePathValue, androidStudioExePathValue;
|
|
|
|
|
|
|
|
Viewport propertyViewport;
|
|
|
|
PropertyGroupComponent propertyGroup { "Global Paths", { getIcons().openFolder, Colours::transparentBlack } };
|
|
|
|
|