diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h index fdcce766ae..6449d1cd44 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h @@ -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;