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

bkaradzic · Dec 9, 2016 · 03e204c · 03e204c
2 parents dadd01d + f14532a
commit 03e204c
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
@@ -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"))