Browse Source

wasm batch fixes

Brian Fiete 3 years ago
parent
commit
db065d0cd7
1 changed files with 5 additions and 1 deletions
  1. 5 1
      bin/build_wasm.bat

+ 5 - 1
bin/build_wasm.bat

@@ -1,10 +1,14 @@
 PUSHD %~dp0..\
 
+SETLOCAL
+
 mkdir wasm
 cd wasm
 @IF %ERRORLEVEL% NEQ 0 GOTO HADERROR
 
+set LIBPATH=..\bin
 IF NOT EXIST ..\BeefRT\rt\Chars.cpp GOTO SKIPCOPY
+set LIBPATH=..\IDE\dist
 mkdir src
 mkdir src\rt
 copy ..\BeefRT\rt\* src\rt\
@@ -30,7 +34,7 @@ IF "%1" EQU "setup" GOTO SUCCESS
 
 call emcc src\rt\Chars.cpp src\rt\Math.cpp src\rt\Object.cpp src\rt\Thread.cpp src\rt\Internal.cpp src\BeefySysLib\platform\wasm\WasmCommon.cpp src\BeefySysLib\Common.cpp src\BeefySysLib\util\String.cpp src\BeefySysLib\util\UTF8.cpp src\BeefySysLib\third_party\utf8proc\utf8proc.c -Isrc\ -Isrc\BeefySysLib -Isrc\BeefySysLib\platform\wasm -g -DBF_DISABLE_FFI -c -s WASM=1 -s USE_PTHREADS=1
 @IF %ERRORLEVEL% NEQ 0 GOTO HADERROR
-call emar r ..\IDE\dist\Beef042RT32_wasm.a Common.o Internal.o Chars.o Math.o Object.o String.o Thread.o UTF8.o utf8proc.o WasmCommon.o
+call emar r %LIBPATH%\Beef042RT32_wasm.a Common.o Internal.o Chars.o Math.o Object.o String.o Thread.o UTF8.o utf8proc.o WasmCommon.o
 @IF %ERRORLEVEL% NEQ 0 GOTO HADERROR
 
 :SUCCESS