diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 981f29c..88d2672 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -30,15 +30,6 @@ // TODO: handle pre/post build commands -string vsCpuArchitecture(string architecture) -{ - switch(architecture) { - default: logWarn("Unsupported platform('%s'), defaulting to x86", architecture); goto case; - case "x86": return "Win32"; - case "x86_64": return "x64"; - } -} - class VisualDGenerator : ProjectGenerator { private { @@ -105,12 +96,12 @@ // Global section contains configurations ret.put("Global\n"); ret.put("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n"); - ret.formattedWrite("\t\t%s|%s = %s|%s\n", settings.buildType, settings.platform.architecture[0].vsCpuArchitecture, settings.buildType, settings.platform.architecture[0].vsCpuArchitecture); + ret.formattedWrite("\t\t%s|%s = %s|%s\n", settings.buildType, settings.platform.architecture[0].vsArchitecture, settings.buildType, settings.platform.architecture[0].vsArchitecture); ret.put("\tEndGlobalSection\n"); ret.put("\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\n"); const string[] sub = ["ActiveCfg", "Build.0"]; - const string[] conf = [settings.buildType~"|"~settings.platform.architecture[0].vsCpuArchitecture]; + const string[] conf = [settings.buildType~"|"~settings.platform.architecture[0].vsArchitecture]; auto projectUuid = guid(mainpack); foreach (t; targets.byKey) foreach (c; conf) @@ -259,7 +250,7 @@ } foreach(architecture; settings.platform.architecture) { - auto arch = architecture.vsCpuArchitecture; + auto arch = architecture.vsArchitecture; ret.formattedWrite(" \n", to!string(type), arch); // FIXME: handle compiler options in an abstract way instead of searching for DMD specific flags @@ -521,3 +512,12 @@ { return pack.replace(":", "_"); } + +private string vsArchitecture(string architecture) +{ + switch(architecture) { + default: logWarn("Unsupported platform('%s'), defaulting to x86", architecture); goto case; + case "x86": return "Win32"; + case "x86_64": return "x64"; + } +}