diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2019-01-26 17:33:30 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2019-01-26 17:33:30 -0500 |
| commit | ee5fa541341cf55d33efa2db9574807f6eefac62 (patch) | |
| tree | c0123eae339ebec66e452edd9ff1a577757531fb | |
| parent | Update slurp and spit error handler. (diff) | |
Generated files go to the same location on win32.
| -rw-r--r-- | build_win.bat | 8 | ||||
| -rw-r--r-- | tools/amalg.janet | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/build_win.bat b/build_win.bat index 1f980438..225197bc 100644 --- a/build_win.bat +++ b/build_win.bat @@ -30,15 +30,15 @@ mkdir build\mainclient @if errorlevel 1 goto :BUILDFAIL @rem Generate the embedded sources -@build\xxd.exe src\core\core.janet build\core\core.gen.c janet_gen_core +@build\xxd.exe src\core\core.janet build\core.gen.c janet_gen_core @if errorlevel 1 goto :BUILDFAIL -@build\xxd.exe src\mainclient\init.janet build\mainclient\init.gen.c janet_gen_init +@build\xxd.exe src\mainclient\init.janet build\init.gen.c janet_gen_init @if errorlevel 1 goto :BUILDFAIL @rem Build the generated sources -@%JANET_COMPILE% /Fobuild\core\core.gen.obj build\core\core.gen.c +@%JANET_COMPILE% /Fobuild\core\core.gen.obj build\core.gen.c @if errorlevel 1 goto :BUILDFAIL -@%JANET_COMPILE% /Fobuild\mainclient\init.gen.obj build\mainclient\init.gen.c +@%JANET_COMPILE% /Fobuild\mainclient\init.gen.obj build\init.gen.c @if errorlevel 1 goto :BUILDFAIL @rem Build the sources diff --git a/tools/amalg.janet b/tools/amalg.janet index 59e104a1..1a6270f9 100644 --- a/tools/amalg.janet +++ b/tools/amalg.janet @@ -6,9 +6,6 @@ (defn dofile "Print one file to stdout" [path] - (def path (if (= (os/which) :windows) - (string/replace "/" "\\" path) - path)) (print (slurp path))) # Order is important here, as some headers |