From 103bcb499469926a928de1021456d85158be75f8 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 22 Jun 2017 19:16:04 -0400 Subject: [PATCH] included cl setup scripts --- build_scripts/setup_cl_generic.bat | 6 ++++++ build_scripts/setup_cl_x64.bat | 4 ++++ build_scripts/setup_cl_x86.bat | 5 +++++ meta/build.cpp | 5 ++++- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 build_scripts/setup_cl_generic.bat create mode 100644 build_scripts/setup_cl_x64.bat create mode 100644 build_scripts/setup_cl_x86.bat diff --git a/build_scripts/setup_cl_generic.bat b/build_scripts/setup_cl_generic.bat new file mode 100644 index 00000000..00263f2a --- /dev/null +++ b/build_scripts/setup_cl_generic.bat @@ -0,0 +1,6 @@ +@echo off + +IF NOT DEFINED LIB (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %1) +IF NOT DEFINED LIB (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %1) + + diff --git a/build_scripts/setup_cl_x64.bat b/build_scripts/setup_cl_x64.bat new file mode 100644 index 00000000..c953d5e0 --- /dev/null +++ b/build_scripts/setup_cl_x64.bat @@ -0,0 +1,4 @@ +@echo off + +setup_cl_generic.bat amd64 + diff --git a/build_scripts/setup_cl_x86.bat b/build_scripts/setup_cl_x86.bat new file mode 100644 index 00000000..33fdcc1f --- /dev/null +++ b/build_scripts/setup_cl_x86.bat @@ -0,0 +1,5 @@ +@echo off + +setup_cl_generic.bat amd64_x86 + + diff --git a/meta/build.cpp b/meta/build.cpp index d0b4d301..32381b4b 100644 --- a/meta/build.cpp +++ b/meta/build.cpp @@ -158,7 +158,10 @@ build_cl(u32 flags, char *code_path, char *code_file, char *out_path, char *out_ init_build_line(&line_prefix); if (flags & X86){ - build_ap(line_prefix, "SETUP_CLX86 & "); + build_ap(line_prefix, "BUILD_SCRIPTS\\SETUP_CL_X86 & "); + } + else{ + build_ap(line_prefix, "BUILD_SCRIPTS\\SETUP_CL_X64 & "); } if (flags & OPTS){