aboutsummaryrefslogtreecommitdiffhomepage
path: root/build_win.bat
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2019-05-28 20:45:39 -0400
committerCalvin Rose <calsrose@gmail.com>2019-05-28 20:45:39 -0400
commitdb55277b58cce460827bc77a90cc80c9639a6b6c (patch)
treeb6c75f9e08b6e26f52567f2b7cf5f44cac31a963 /build_win.bat
parentUpdate CI tasks. (diff)
Work on windows installer.
We will probably shift to NSIS as the default installation method for windows. Shipping around a single binary just doesn't cut it if we want to be able to reliably use tools like `jpm` to build things.
Diffstat (limited to 'build_win.bat')
-rw-r--r--build_win.bat8
1 files changed, 6 insertions, 2 deletions
diff --git a/build_win.bat b/build_win.bat
index ee33847b..e02c4894 100644
--- a/build_win.bat
+++ b/build_win.bat
@@ -53,7 +53,7 @@ for %%f in (src\boot\*.c) do (
)
%JANET_LINK% /out:build\janet_boot.exe build\boot\*.obj
@if errorlevel 1 goto :BUILDFAIL
-build\janet_boot build\core_image.c JANET_PATH "C:/Janet/Library"
+build\janet_boot build\core_image.c
@rem Build the core image
@%JANET_COMPILE% /Fobuild\core_image.obj build\core_image.c
@@ -65,6 +65,9 @@ for %%f in (src\core\*.c) do (
@if errorlevel 1 goto :BUILDFAIL
)
+@rem Build the resources
+rc /nologo /fobuild\janet_win.res janet_win.rc
+
@rem Build the main client
for %%f in (src\mainclient\*.c) do (
@%JANET_COMPILE% /Fobuild\mainclient\%%~nf.obj %%f
@@ -72,7 +75,7 @@ for %%f in (src\mainclient\*.c) do (
)
@rem Link everything to main client
-%JANET_LINK% /out:janet.exe build\core\*.obj build\mainclient\*.obj build\core_image.obj
+%JANET_LINK% /out:janet.exe build\core\*.obj build\mainclient\*.obj build\core_image.obj build\janet_win.res
@if errorlevel 1 goto :BUILDFAIL
@rem Gen amlag
@@ -132,6 +135,7 @@ copy src\include\janetconf.h dist\janetconf.h
copy tools\cook.janet dist\cook.janet
copy tools\highlight.janet dist\highlight.janet
copy tools\jpm dist\jpm
+copy tools\jpm.bat dist\jpm.bat
exit /b 0
:TESTFAIL