From fb9fb495fbf95955eb33238274ecef209b5eb50c Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Sun, 4 Sep 2022 19:36:21 -0700 Subject: [PATCH] fixed windows build --- build.bat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.bat b/build.bat index 41d2ef9b..d69552db 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,7 @@ @echo off REM Compile the compiler -set SOURCE_FILES=src/onyx.c src/astnodes.c src/builtins.c src/checker.c src/clone.c src/doc.c src/entities.c src/errors.c src/lex.c src/parser.c src/symres.c src/types.c src/utils.c src/wasm_emit.c src/wasm_runtime.c +set SOURCE_FILES=compiler/src/onyx.c compiler/src/astnodes.c compiler/src/builtins.c compiler/src/checker.c compiler/src/clone.c compiler/src/doc.c compiler/src/entities.c compiler/src/errors.c compiler/src/lex.c compiler/src/parser.c compiler/src/symres.c compiler/src/types.c compiler/src/utils.c compiler/src/wasm_emit.c compiler/src/wasm_runtime.c if "%1" == "1" ( set FLAGS=/Od /MTd /Z7 @@ -11,11 +11,11 @@ if "%1" == "1" ( for /f "delims=" %%i in ('cd') do set PWD=%%i -set LINK_OPTIONS="%PWD%\lib\windows_x86_64\lib\wasmer.lib" ws2_32.lib Advapi32.lib userenv.lib bcrypt.lib kernel32.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib -set FLAGS=%FLAGS% "/I%PWD%\lib\common\include" /DENABLE_RUN_WITH_WASMER=1 +set LINK_OPTIONS="%PWD%\shared\lib\windows_x86_64\lib\wasmer.lib" ws2_32.lib Advapi32.lib userenv.lib bcrypt.lib kernel32.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib +set FLAGS=%FLAGS% "/I%PWD%\shared\include" /DENABLE_RUN_WITH_WASMER=1 rc.exe misc/icon_resource.rc -cl.exe %FLAGS% /Iinclude /std:c17 /TC %SOURCE_FILES% /link /IGNORE:4217 %LINK_OPTIONS% /DEBUG /OUT:onyx.exe /incremental:no /opt:ref /subsystem:console misc\icon_resource.res +cl.exe %FLAGS% /Icompiler/include /std:c17 /TC %SOURCE_FILES% /link /IGNORE:4217 %LINK_OPTIONS% /DEBUG /OUT:onyx.exe /incremental:no /opt:ref /subsystem:console misc\icon_resource.res del *.pdb > NUL 2> NUL del *.ilk > NUL 2> NUL @@ -23,17 +23,17 @@ del *.obj > NUL 2> NUL del misc\icon_resource.res REM Compile the onyx-run tool -set SOURCE_FILES=src/onyxrun.c src/wasm_runtime.c +set SOURCE_FILES=compiler/src/onyxrun.c compiler/src/wasm_runtime.c rc.exe misc/icon_resource.rc -cl.exe %FLAGS% /Iinclude /std:c17 /TC %SOURCE_FILES% /link /IGNORE:4217 %LINK_OPTIONS% /DEBUG /OUT:onyx-run.exe /incremental:no /opt:ref /subsystem:console misc\icon_resource.res +cl.exe %FLAGS% /Icompiler/include /std:c17 /TC %SOURCE_FILES% /link /IGNORE:4217 %LINK_OPTIONS% /DEBUG /OUT:onyx-run.exe /incremental:no /opt:ref /subsystem:console misc\icon_resource.res del *.pdb > NUL 2> NUL del *.ilk > NUL 2> NUL del *.obj > NUL 2> NUL del misc\icon_resource.res -cl /MT /std:c17 /TC /I include /I lib/common/include /D_USRDLL /D_WINDLL src\onyx_runtime.c /link /DLL ws2_32.lib /OUT:onyx_runtime.dll +cl /MT /std:c17 /TC /I compiler/include /I shared/include /D_USRDLL /D_WINDLL runtime\onyx_runtime.c /link /DLL ws2_32.lib /OUT:onyx_runtime.dll del onyx_runtime.obj del onyx_runtime.lib -- 2.25.1