@@ -753,17 +753,17 @@ private: | |||
void initialiseDependencyPathValues() | |||
{ | |||
sdkPath = Value (new DependencyPathValueSource ( | |||
sdkPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::androidSDKPath), | |||
DependencyPath::androidSdkKeyName, | |||
DependencyPath::getThisOS() | |||
)); | |||
))); | |||
ndkPath = Value (new DependencyPathValueSource ( | |||
ndkPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::androidNDKPath), | |||
DependencyPath::androidNdkKeyName, | |||
DependencyPath::getThisOS() | |||
)); | |||
))); | |||
} | |||
//============================================================================== | |||
@@ -405,33 +405,33 @@ private: | |||
void initialiseDependencyPathValues() | |||
{ | |||
DependencyPathOS pathOS = isLinux() ? DependencyPathOS::linux : DependencyPathOS::windows; | |||
DependencyPathOS pathOS = isLinux() ? DependencyPath::linux : DependencyPath::windows; | |||
vst2Path = Value (new DependencyPathValueSource ( | |||
vst2Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vstFolder), | |||
DependencyPath::vst2KeyName, | |||
pathOS | |||
)); | |||
))); | |||
vst3Path = Value (new DependencyPathValueSource ( | |||
vst3Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vst3Folder), | |||
DependencyPath::vst3KeyName, | |||
pathOS | |||
)); | |||
))); | |||
if (! isLinux()) | |||
{ | |||
aaxPath = Value (new DependencyPathValueSource ( | |||
aaxPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::aaxFolder), | |||
DependencyPath::aaxKeyName, | |||
pathOS | |||
)); | |||
))); | |||
rtasPath = Value (new DependencyPathValueSource ( | |||
rtasPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::rtasFolder), | |||
DependencyPath::rtasKeyName, | |||
pathOS | |||
)); | |||
))); | |||
} | |||
} | |||
@@ -559,29 +559,29 @@ protected: | |||
void initialiseDependencyPathValues() | |||
{ | |||
vst2Path = Value (new DependencyPathValueSource ( | |||
vst2Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vstFolder), | |||
DependencyPath::vst2KeyName, | |||
DependencyPathOS::windows | |||
)); | |||
DependencyPath::windows | |||
))); | |||
vst3Path = Value (new DependencyPathValueSource ( | |||
vst3Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vst3Folder), | |||
DependencyPath::vst3KeyName, | |||
DependencyPathOS::windows | |||
)); | |||
DependencyPath::windows | |||
))); | |||
aaxPath = Value (new DependencyPathValueSource ( | |||
aaxPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::aaxFolder), | |||
DependencyPath::aaxKeyName, | |||
DependencyPathOS::windows | |||
)); | |||
DependencyPath::windows | |||
))); | |||
rtasPath = Value (new DependencyPathValueSource ( | |||
rtasPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::rtasFolder), | |||
DependencyPath::rtasKeyName, | |||
DependencyPathOS::windows | |||
)); | |||
DependencyPath::windows | |||
))); | |||
} | |||
JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterBase) | |||
@@ -350,17 +350,17 @@ private: | |||
void initialiseDependencyPathValues() | |||
{ | |||
vst2Path = Value (new DependencyPathValueSource ( | |||
vst2Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vstFolder), | |||
DependencyPath::vst2KeyName, | |||
DependencyPathOS::linux | |||
)); | |||
DependencyPath::linux | |||
))); | |||
vst3Path = Value (new DependencyPathValueSource ( | |||
vst3Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vst3Folder), | |||
DependencyPath::vst3KeyName, | |||
DependencyPathOS::linux | |||
)); | |||
DependencyPath::linux | |||
))); | |||
} | |||
JUCE_DECLARE_NON_COPYABLE (MakefileProjectExporter) | |||
@@ -1504,28 +1504,28 @@ private: | |||
void initialiseDependencyPathValues() | |||
{ | |||
vst2Path = Value (new DependencyPathValueSource ( | |||
vst2Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vstFolder), | |||
DependencyPath::vst2KeyName, | |||
DependencyPathOS::osx | |||
)); | |||
DependencyPath::osx | |||
))); | |||
vst3Path = Value (new DependencyPathValueSource ( | |||
vst3Path.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::vst3Folder), | |||
DependencyPath::vst3KeyName, | |||
DependencyPathOS::osx | |||
)); | |||
DependencyPath::osx | |||
))); | |||
aaxPath = Value (new DependencyPathValueSource ( | |||
aaxPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::aaxFolder), | |||
DependencyPath::aaxKeyName, | |||
DependencyPathOS::osx | |||
)); | |||
DependencyPath::osx | |||
))); | |||
rtasPath = Value (new DependencyPathValueSource ( | |||
rtasPath.referTo (Value (new DependencyPathValueSource ( | |||
getSetting (Ids::rtasFolder), | |||
DependencyPath::rtasKeyName, | |||
DependencyPathOS::osx | |||
)); | |||
DependencyPath::osx | |||
))); | |||
} | |||
}; |