Merge branch 'master' of github.com:bkaradzic/bx

This commit is contained in:
Branimir Karadžić
2016-12-08 22:57:08 -08:00

View File

@@ -585,6 +585,21 @@ function toolchain(_buildDir, _libDir)
path.join(_libDir, "lib/win64_" .. _ACTION),
}
configuration { "x32", "vs2017" }
targetdir (path.join(_buildDir, "win32_" .. _ACTION, "bin"))
objdir (path.join(_buildDir, "win32_" .. _ACTION, "obj"))
libdirs {
path.join(_libDir, "lib/win32_" .. _ACTION),
}
configuration { "x64", "vs2017" }
defines { "_WIN64" }
targetdir (path.join(_buildDir, "win64_" .. _ACTION, "bin"))
objdir (path.join(_buildDir, "win64_" .. _ACTION, "obj"))
libdirs {
path.join(_libDir, "lib/win64_" .. _ACTION),
}
configuration { "ARM", "vs*" }
targetdir (path.join(_buildDir, "arm_" .. _ACTION, "bin"))
objdir (path.join(_buildDir, "arm_" .. _ACTION, "obj"))