relying on the good setup scripts for buildsuper

master
Allen Webster 2017-06-22 21:04:42 -04:00
parent 28cc8cf2e3
commit 66f421dd77
6 changed files with 20 additions and 18 deletions

View File

@ -1,7 +1,12 @@
@echo off @echo off
IF NOT DEFINED LIB (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64) REM This stores the path of the buildsuper.bat script
IF NOT DEFINED LIB (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64) REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0
IF NOT DEFINED LIB (call "%CODE_HOME%\\build_scripts\\setup_cl_x64.bat")
SET SRC=%1 SET SRC=%1
if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp
@ -12,13 +17,6 @@ SET DEBUG=/Zi
SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF
SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version
REM This stores the path of the buildsuper.bat script
REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0
cl %OPTS% /I"%CODE_HOME% " %DEBUG% "%SRC%" /Fecustom_4coder %BUILD_DLL% %EXPORTS% cl %OPTS% /I"%CODE_HOME% " %DEBUG% "%SRC%" /Fecustom_4coder %BUILD_DLL% %EXPORTS%
REM file spammation preventation REM file spammation preventation

View File

@ -1,6 +1,12 @@
@echo off @echo off
IF NOT DEFINED LIB (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64_x86) REM This stores the path of the buildsuper.bat script
REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0
IF NOT DEFINED LIB (call "%CODE_HOME%\\build_scripts\\setup_cl_x86.bat")
SET SRC=%1 SET SRC=%1
if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp
@ -11,12 +17,6 @@ SET DEBUG=/Zi
SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF
SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version
REM This stores the path of the buildsuper.bat script
REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0
cl /I%CODE_HOME% %OPTS% %DEBUG% %SRC% /Fecustom_4coder %BUILD_DLL% %EXPORTS% cl /I%CODE_HOME% %OPTS% %DEBUG% %SRC% /Fecustom_4coder %BUILD_DLL% %EXPORTS%
REM file spammation preventation REM file spammation preventation

View File

@ -158,7 +158,7 @@ build_cl(u32 flags, char *code_path, char *code_file, char *out_path, char *out_
init_build_line(&line_prefix); init_build_line(&line_prefix);
if (flags & X86){ if (flags & X86){
build_ap(line_prefix, "%s\\build_scripts\\setup_cl_x86.bat & ", code_path); build_ap(line_prefix, "%s\\windows_scripts\\setup_cl_x86.bat & ", code_path);
} }
if (flags & OPTS){ if (flags & OPTS){
@ -361,7 +361,7 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){
char *build_script = "buildsuper.bat"; char *build_script = "buildsuper.bat";
if (x86_build){ if (x86_build){
prefix_1 = code_path; prefix_1 = code_path;
prefix_2 = "\\build_script\\setup_cl_x86.bat & "; prefix_2 = "\\windows_scripts\\setup_cl_x86.bat & ";
build_script = "buildsuper_x86.bat"; build_script = "buildsuper_x86.bat";
} }
systemf("%s%scall \"%s\\%s\" %s", prefix_1, prefix_2, code_path, build_script, filename); systemf("%s%scall \"%s\\%s\" %s", prefix_1, prefix_2, code_path, build_script, filename);
@ -760,6 +760,10 @@ package(char *cdir){
copy_file(0, "buildsuper" BAT, dir, 0, 0); copy_file(0, "buildsuper" BAT, dir, 0, 0);
#if defined(IS_WINDOWS)
copy_folder(dir, "windows_scripts");
#endif
copy_folder(dir, "4coder_API"); copy_folder(dir, "4coder_API");
copy_folder(dir, "4coder_helper"); copy_folder(dir, "4coder_helper");
copy_folder(dir, "4coder_lib"); copy_folder(dir, "4coder_lib");