mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Fixed a bug in the MSVC exporter where the architecture setting was not being recalled correctly if set to "default"

Browse source
This commit is contained in:
ed 2018-03-27 09:15:58 +01:00
parent e98c73bc6d
commit 4a80292515
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h
View file

@ -1058,16 +1058,14 @@ public:
RelativePath bundleScript = aaxSDK.getChildFile ("Utilities").getChildFile ("CreatePackage.bat");
RelativePath iconFilePath = getAAXIconFile();
auto is64Bit = (config.config [Ids::winArchitecture] == "x64");
auto outputFilename = config.getOutputFilename (".aaxplugin", true);
auto bundleDir = getOwner().getOutDirFile (config, outputFilename);
auto bundleContents = bundleDir + "\\Contents";
auto macOSDir = bundleContents + String ("\\") + (is64Bit ? "x64" : "Win32");
auto executable = macOSDir + String ("\\") + outputFilename;
auto archDir = bundleContents + String ("\\") + (config.is64Bit() ? "x64" : "Win32");
auto executable = archDir + String ("\\") + outputFilename;
auto pkgScript = String ("copy /Y ") + getOutputFilePath (config).quoted() + String (" ") + executable.quoted() + String ("\r\ncall ")
+ createRebasedPath (bundleScript) + String (" ") + macOSDir.quoted() + String (" ") + createRebasedPath (iconFilePath);
+ createRebasedPath (bundleScript) + String (" ") + archDir.quoted() + String (" ") + createRebasedPath (iconFilePath);
if (config.isPluginBinaryCopyStepEnabled())
return pkgScript + "\r\n" + "xcopy " + bundleDir.quoted() + " "
@ -1093,12 +1091,11 @@ public:
{
String script;
bool is64Bit = (config.config [Ids::winArchitecture] == "x64");
auto bundleDir = getOwner().getOutDirFile (config, config.getOutputFilename (".aaxplugin", false));
auto bundleContents = bundleDir + "\\Contents";
auto macOSDir = bundleContents + String ("\\") + (is64Bit ? "x64" : "Win32");
auto archDir = bundleContents + String ("\\") + (config.is64Bit() ? "x64" : "Win32");
for (auto& folder : StringArray { bundleDir, bundleContents, macOSDir })
for (auto& folder : StringArray { bundleDir, bundleContents, archDir })
script += String ("if not exist \"") + folder + String ("\" mkdir \"") + folder + String ("\"\r\n");
return script;