diff options
| author | gingerBill <bill@gingerbill.org> | 2023-08-03 13:14:09 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2023-08-03 13:14:09 +0100 |
| commit | b495a302b016d37a19a95cac56dc7f67fdc4ba73 (patch) | |
| tree | 8fb72c3f264a61ce442c0a71e84483b31389ca6e /build.bat | |
| parent | c39a3603720917d6970026e5c0595d468ea9b372 (diff) | |
| parent | 9453b2387b2cc7c473547997703c305e7982f5e4 (diff) | |
Merge branch 'master' into tilde
Diffstat (limited to 'build.bat')
| -rw-r--r-- | build.bat | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -51,7 +51,10 @@ set compiler_flags= -nologo -Oi -TP -fp:precise -Gm- -MP -FC -EHsc- -GR- -GF set compiler_defines= -DODIN_VERSION_RAW=\"%odin_version_raw%\" if not exist .git\ goto skip_git_hash -for /f %%i in ('git rev-parse --short HEAD') do set GIT_SHA=%%i +for /f "tokens=1,2" %%i IN ('git show "--pretty=%%cd %%h" "--date=format:%%Y-%%m" --no-patch --no-notes HEAD') do ( + set odin_version_raw=dev-%%i + set GIT_SHA=%%j +) if %ERRORLEVEL% equ 0 set compiler_defines=%compiler_defines% -DGIT_SHA=\"%GIT_SHA%\" :skip_git_hash @@ -75,8 +78,8 @@ set compiler_includes= ^ set libs= ^ kernel32.lib ^ Synchronization.lib ^ - src\tilde\tb.lib ^ - bin\llvm\windows\LLVM-C.lib + bin\llvm\windows\LLVM-C.lib ^ + src\tilde\tb.lib set linker_flags= -incremental:no -opt:ref -subsystem:console |