From 28cc8cf2e31064bddbe9eefecefca8d760524bc8 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 22 Jun 2017 20:41:23 -0400 Subject: [PATCH] fixing up the zip batch --- meta/build.cpp | 2 +- zip.bat | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/build.cpp b/meta/build.cpp index f633e20b..74b43066 100644 --- a/meta/build.cpp +++ b/meta/build.cpp @@ -361,7 +361,7 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){ char *build_script = "buildsuper.bat"; if (x86_build){ prefix_1 = code_path; - prefix_2 = "\\setup_cl_x86.bat & "; + prefix_2 = "\\build_script\\setup_cl_x86.bat & "; build_script = "buildsuper_x86.bat"; } systemf("%s%scall \"%s\\%s\" %s", prefix_1, prefix_2, code_path, build_script, filename); diff --git a/zip.bat b/zip.bat index 689e135e..ca6ab40e 100644 --- a/zip.bat +++ b/zip.bat @@ -3,4 +3,7 @@ REM Usage: zip REM compresses the current directory into a zip named .zip -"C:\Program Files (x86)\7-Zip\7z.exe" a -tzip -y %* \ No newline at end of file +SET ZIP_PATH=C:\Program Files (x86)\7-Zip +IF NOT EXIST "%ZIP_PATH%" (SET ZIP_PATH=C:\Program Files\7-Zip) +IF EXIST "%ZIP_PATH%" ("%ZIP_PATH%\7z.exe" a -tzip -y %*) +