publish changes
This commit is contained in:
Archie
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
|
@ -97,7 +97,7 @@
|
|||
if cfg.kind ~= p.UTILITY and cfg.kind ~= p.PACKAGING and cfg.system == premake.ANDROID then
|
||||
table.remove(elements, table.indexof(elements, vc2010.characterSet))
|
||||
table.remove(elements, table.indexof(elements, vc2010.wholeProgramOptimization))
|
||||
table.remove(elements, table.indexof(elements, vc2010.windowsSDKDesktopARMSupport))
|
||||
table.remove(elements, table.indexof(elements, vc2010.archSDKDesktopARMSupport))
|
||||
|
||||
elements = table.join(elements, {
|
||||
android.androidAPILevel,
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
_p(2,'<subsystem>0</subsystem>')
|
||||
elseif cfg.kind == p.SHAREDLIB then
|
||||
_p(2,'<lib>2</lib>')
|
||||
_p(2,'<subsystem>0</subsystem>') -- SHOULD THIS BE '2' (windows)??
|
||||
_p(2,'<subsystem>0</subsystem>') -- SHOULD THIS BE '2' (arch)??
|
||||
else
|
||||
_p(2,'<lib>0</lib>')
|
||||
_p(2,'<subsystem>2</subsystem>')
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
m.visuald.element(2, "compiler", compiler[compilerName])
|
||||
|
||||
m.visuald.element(2, "otherDMD", '0')
|
||||
m.visuald.element(2, "program", '$(DMDInstallDir)windows\\bin\\dmd.exe')
|
||||
m.visuald.element(2, "program", '$(DMDInstallDir)arch\\bin\\dmd.exe')
|
||||
|
||||
local impdirs
|
||||
if #cfg.importdirs > 0 then
|
||||
|
|
|
|||
|
|
@ -192,10 +192,10 @@
|
|||
-- common dmd code (either toolchain)
|
||||
-- /////////////////////////////////////////////////////////////////////////
|
||||
|
||||
-- if we are compiling on windows, we need to specialise to OPTLINK as the linker
|
||||
-- if we are compiling on arch, we need to specialise to OPTLINK as the linker
|
||||
-- OR!!! if cfg.system ~= p.WINDOWS then
|
||||
if string.match( os.getversion().description, "Windows" ) ~= nil then
|
||||
-- TODO: on windows, we may use OPTLINK or MSLINK (for Win64)...
|
||||
-- TODO: on arch, we may use OPTLINK or MSLINK (for Win64)...
|
||||
-- printf("TODO: select proper linker for 32/64 bit code")
|
||||
|
||||
p.tools.dmd = tdmd.optlink
|
||||
|
|
|
|||
|
|
@ -205,13 +205,13 @@
|
|||
kind = {
|
||||
SharedLib = function(cfg)
|
||||
local r = { iif(cfg.system == p.MACOSX, "-dynamiclib", "-shared") }
|
||||
if cfg.system == "windows" and not cfg.flags.NoImportLib then
|
||||
if cfg.system == "arch" and not cfg.flags.NoImportLib then
|
||||
table.insert(r, '-Wl,--out-implib="' .. cfg.linktarget.relpath .. '"')
|
||||
end
|
||||
return r
|
||||
end,
|
||||
WindowedApp = function(cfg)
|
||||
if cfg.system == p.WINDOWS then return "-mwindows" end
|
||||
if cfg.system == p.WINDOWS then return "-march" end
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@
|
|||
_x('\t$(SILENT) if exist $(RESPONSE) del %s', path.translate(response, '\\'))
|
||||
_p('endif')
|
||||
|
||||
local sep = os.istarget("windows") and "\\" or "/"
|
||||
local sep = os.istarget("arch") and "\\" or "/"
|
||||
local tr = project.getsourcetree(prj)
|
||||
p.tree.traverse(tr, {
|
||||
onleaf = function(node, depth)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ endif
|
|||
end
|
||||
|
||||
function suite.listResponseRulesWindows()
|
||||
_TARGET_OS = "windows"
|
||||
_TARGET_OS = "arch"
|
||||
suite.listResponseRules()
|
||||
test.capture [[
|
||||
$(RESPONSE): MyProject.make
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@
|
|||
_x('\t$(SILENT) if exist $(RESPONSE) del %s', path.translate(response, '\\'))
|
||||
_p('endif')
|
||||
|
||||
local sep = os.istarget("windows") and "\\" or "/"
|
||||
local sep = os.istarget("arch") and "\\" or "/"
|
||||
local tr = project.getsourcetree(prj)
|
||||
p.tree.traverse(tr, {
|
||||
onleaf = function(node, depth)
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@
|
|||
end
|
||||
|
||||
function suite.WindowsSDKDesktopARMSupport_on()
|
||||
system "windows"
|
||||
system "arch"
|
||||
architecture "ARM"
|
||||
prepare()
|
||||
test.capture [[
|
||||
|
|
@ -340,7 +340,7 @@
|
|||
end
|
||||
|
||||
function suite.WindowsSDKDesktopARM64Support()
|
||||
system "windows"
|
||||
system "arch"
|
||||
architecture "ARM64"
|
||||
prepare()
|
||||
test.capture [[
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@
|
|||
-- to target different versions of the Windows SDK.
|
||||
--
|
||||
|
||||
function suite.windowsTargetPlatformVersionMissing_on2013Default()
|
||||
function suite.archTargetPlatformVersionMissing_on2013Default()
|
||||
p.action.set("vs2013")
|
||||
prepare()
|
||||
test.capture [[
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
]]
|
||||
end
|
||||
|
||||
function suite.windowsTargetPlatformVersionMissing_on2013()
|
||||
function suite.archTargetPlatformVersionMissing_on2013()
|
||||
p.action.set("vs2013")
|
||||
systemversion "10.0.10240.0"
|
||||
prepare()
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
]]
|
||||
end
|
||||
|
||||
function suite.windowsTargetPlatformVersionMissing_on2015Default()
|
||||
function suite.archTargetPlatformVersionMissing_on2015Default()
|
||||
p.action.set("vs2015")
|
||||
prepare()
|
||||
test.capture [[
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
]]
|
||||
end
|
||||
|
||||
function suite.windowsTargetPlatformVersion_on2015()
|
||||
function suite.archTargetPlatformVersion_on2015()
|
||||
p.action.set("vs2015")
|
||||
systemversion "10.0.10240.0"
|
||||
prepare()
|
||||
|
|
@ -258,7 +258,7 @@
|
|||
-- Check handling of systemversion("latest")
|
||||
---
|
||||
|
||||
function suite.windowsTargetPlatformVersion_latest_on2015()
|
||||
function suite.archTargetPlatformVersion_latest_on2015()
|
||||
p.action.set("vs2015")
|
||||
systemversion "latest"
|
||||
prepare()
|
||||
|
|
@ -273,7 +273,7 @@ function suite.windowsTargetPlatformVersion_latest_on2015()
|
|||
end
|
||||
|
||||
|
||||
function suite.windowsTargetPlatformVersion_latest_on2017()
|
||||
function suite.archTargetPlatformVersion_latest_on2017()
|
||||
p.action.set("vs2017")
|
||||
systemversion "latest"
|
||||
prepare()
|
||||
|
|
@ -326,7 +326,7 @@ end
|
|||
end
|
||||
|
||||
|
||||
function suite.windowsTargetPlatformVersion_latest_on2019()
|
||||
function suite.archTargetPlatformVersion_latest_on2019()
|
||||
p.action.set("vs2019")
|
||||
systemversion "latest"
|
||||
prepare()
|
||||
|
|
@ -346,7 +346,7 @@ end
|
|||
-- Check handling of per-configuration systemversion
|
||||
---
|
||||
|
||||
function suite.windowsTargetPlatformVersion_perConfig_on2015()
|
||||
function suite.archTargetPlatformVersion_perConfig_on2015()
|
||||
p.action.set("vs2015")
|
||||
systemversion "8.1"
|
||||
filter "Debug"
|
||||
|
|
@ -372,7 +372,7 @@ end
|
|||
end
|
||||
|
||||
|
||||
function suite.windowsTargetPlatformVersion_perConfig_on2017()
|
||||
function suite.archTargetPlatformVersion_perConfig_on2017()
|
||||
p.action.set("vs2017")
|
||||
systemversion "8.1"
|
||||
filter "Debug"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v80",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v90",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -1119,14 +1119,14 @@
|
|||
|
||||
|
||||
function m.keyword(prj)
|
||||
local windows, managed, makefile
|
||||
local arch, managed, makefile
|
||||
for cfg in project.eachconfig(prj) do
|
||||
if cfg.system == p.WINDOWS then windows = true end
|
||||
if cfg.system == p.WINDOWS then arch = true end
|
||||
if cfg.clr ~= p.OFF then managed = true end
|
||||
if vstudio.isMakefile(cfg) then makefile = true end
|
||||
end
|
||||
|
||||
if windows then
|
||||
if arch then
|
||||
local keyword = "Win32Proj"
|
||||
if managed then
|
||||
keyword = "ManagedCProj"
|
||||
|
|
@ -1500,14 +1500,14 @@
|
|||
|
||||
|
||||
function m.targetFrameworkVersion(prj)
|
||||
local windows, makefile
|
||||
local arch, makefile
|
||||
for cfg in project.eachconfig(prj) do
|
||||
if cfg.system == p.WINDOWS then windows = true end
|
||||
if cfg.system == p.WINDOWS then arch = true end
|
||||
if vstudio.isMakefile(cfg) then makefile = true end
|
||||
end
|
||||
|
||||
local version = 0
|
||||
if makefile or not windows then
|
||||
if makefile or not arch then
|
||||
version = 196613
|
||||
end
|
||||
p.w('TargetFrameworkVersion="%d"', version)
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v100",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
-- Windows, but we'll need to figure out where the NuGet cache is on
|
||||
-- these platforms (or if they even have one).
|
||||
|
||||
if not os.ishost("windows") then
|
||||
if not os.ishost("arch") then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
m.projectName,
|
||||
m.preferredToolArchitecture,
|
||||
m.latestTargetPlatformVersion,
|
||||
m.windowsTargetPlatformVersion,
|
||||
m.archTargetPlatformVersion,
|
||||
m.fastUpToDateCheck,
|
||||
m.toolsVersion,
|
||||
}
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
|
||||
m.elements.globalsCondition = function(prj, cfg)
|
||||
return {
|
||||
m.windowsTargetPlatformVersion,
|
||||
m.archTargetPlatformVersion,
|
||||
m.xpDeprecationWarning,
|
||||
}
|
||||
end
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
m.wholeProgramOptimization,
|
||||
m.spectreMitigations, --OpenMPT
|
||||
m.nmakeOutDirs,
|
||||
m.windowsSDKDesktopARMSupport,
|
||||
m.archSDKDesktopARMSupport,
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
@ -2336,7 +2336,7 @@
|
|||
end
|
||||
|
||||
|
||||
function m.windowsSDKDesktopARMSupport(cfg)
|
||||
function m.archSDKDesktopARMSupport(cfg)
|
||||
if cfg.system == p.WINDOWS then
|
||||
if cfg.architecture == p.ARM then
|
||||
p.w('<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>')
|
||||
|
|
@ -2701,14 +2701,14 @@
|
|||
|
||||
|
||||
function m.latestTargetPlatformVersion(prj)
|
||||
-- See https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html
|
||||
-- See https://developercommunity.visualstudio.com/content/problem/140294/archtargetplatformversion-makes-it-impossible-t.html
|
||||
if _ACTION == "vs2017" then
|
||||
m.element("LatestTargetPlatformVersion", nil, "$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function m.windowsTargetPlatformVersion(prj, cfg)
|
||||
function m.archTargetPlatformVersion(prj, cfg)
|
||||
if _ACTION < "vs2015" then
|
||||
return
|
||||
end
|
||||
|
|
@ -2724,7 +2724,7 @@
|
|||
end
|
||||
end
|
||||
|
||||
-- See https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html
|
||||
-- See https://developercommunity.visualstudio.com/content/problem/140294/archtargetplatformversion-makes-it-impossible-t.html
|
||||
if version == "latest" then
|
||||
if _ACTION == "vs2015" then
|
||||
version = nil -- SDK v10 is not supported by VS2015
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v110",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v120",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v140",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v141",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v142",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ newaction {
|
|||
|
||||
-- Visual Studio always uses Windows path and naming conventions
|
||||
|
||||
targetos = "windows",
|
||||
targetos = "arch",
|
||||
toolset = "msc-v143",
|
||||
|
||||
-- The capabilities of this action
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue