From 3ba2488541d6289ba581b77d7c3357c7e686a865 Mon Sep 17 00:00:00 2001 From: martinfouilleul Date: Sat, 17 Jun 2023 20:10:11 +0200 Subject: [PATCH] [win32] runtime compiles, and boots (without loading wasm module) --- build.bat | 7 +++++-- milepost | 2 +- src/main.c | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.bat b/build.bat index ae9fef7..f30ac99 100644 --- a/build.bat +++ b/build.bat @@ -28,9 +28,12 @@ if %target% == milepost ( if %target% == orca ( echo building orca + set pthread_dir=..\vcpkg\packages\pthreads_x64-windows + ::copy libraries copy milepost\bin\milepost.dll bin copy milepost\bin\milepost.dll.lib bin + copy %pthread_dir%\bin\pthreadVC3.dll bin ::generate wasm3 api bindings python3 scripts\bindgen.py core src @@ -48,8 +51,8 @@ if %target% == orca ( --wasm3-bindings src\io_api_bind_gen.c ::compile orca - set INCLUDES=/I src /I sdk /I ext\wasm3\source /I milepost\src /I milepost\ext /I ..\vcpkg\packages\pthreads_x64-windows\include - set LIBS=/LIBPATH:bin /LIBPATH:..\vcpkg\packages\pthreads_x64-windows\lib milepost.dll.lib wasm3.lib pthreadVC3.lib + set INCLUDES=/I src /I sdk /I ext\wasm3\source /I milepost\src /I milepost\ext /I %pthread_dir%\include + set LIBS=/LIBPATH:bin /LIBPATH:%pthread_dir%\lib milepost.dll.lib wasm3.lib pthreadVC3.lib cl /Zi /Zc:preprocessor /std:c11 %INCLUDES% src\main.c /link %LIBS% /out:bin\orca.exe ) diff --git a/milepost b/milepost index e93bf76..d2c4acf 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit e93bf76adcf8e26b4d039da1066847bdf7b80d1f +Subproject commit d2c4acf6e2e13d251c036ab8bd51e70d9c28505f diff --git a/src/main.c b/src/main.c index eaf67a0..36055ae 100644 --- a/src/main.c +++ b/src/main.c @@ -285,6 +285,7 @@ char m3_type_to_tag(M3ValueType type) return('d'); case c_m3Type_unknown: + default: return('!'); } }