Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 04:52:21 +02:00
Code Activity

Fixed path for emcc

Browse source
This commit is contained in:
Brian Fiete 2020-08-09 07:19:44 -07:00
parent a0a828a88f
commit b6e14d36f2
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDE/src/BuildContext.bf
View file

@ -578,30 +578,26 @@ namespace IDE
linkLine.Append(linkFlags, " "); linkLine.Append(linkFlags, " ");
} }
#if BF_PLATFORM_WINDOWS
String compilerExePath = scope String(); String compilerExePath = scope String();
#if BF_PLATFORM_WINDOWS
String llvmDir = scope String(IDEApp.sApp.mInstallDir); String llvmDir = scope String(IDEApp.sApp.mInstallDir);
IDEUtils.FixFilePath(llvmDir); IDEUtils.FixFilePath(llvmDir);
llvmDir.Append("llvm/"); llvmDir.Append("llvm/");
compilerExePath.Append(llvmDir, "bin/wasm-ld.exe");
#else #else
String llvmDir = ""; String llvmDir = "";
bool isWSL = false; bool isWSL = false;
String compilerExePath = "wasm-ld";
#endif #endif
//compilerExePath.Set(@"C:\temp\emsdk\upstream\emscripten\emcc.bat");
if (!gApp.mSettings.mEmscriptenPath.IsEmpty) if (!gApp.mSettings.mEmscriptenPath.IsEmpty)
{ {
compilerExePath.Append(gApp.mSettings.mEmscriptenPath); compilerExePath.Append(gApp.mSettings.mEmscriptenPath);
if ((!compilerExePath.EndsWith('\\')) && (!compilerExePath.EndsWith('/'))) if ((!compilerExePath.EndsWith('\\')) && (!compilerExePath.EndsWith('/')))
compilerExePath.Append("/"); compilerExePath.Append("/");
} }
compilerExePath.Append(@"emcc.bat"); compilerExePath.Append(@"/upstream/emscripten/emcc.bat");
//linkLine.Append(" c:\\Beef\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1 -s \"EXPORTED_FUNCTIONS=['_BeefMain','_BeefDone','_pthread_mutexattr_init','_pthread_mutex_init','_emscripten_futex_wake','_calloc','_sbrk']\""); //linkLine.Append(" c:\\Beef\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1 -s \"EXPORTED_FUNCTIONS=['_BeefMain','_BeefDone','_pthread_mutexattr_init','_pthread_mutex_init','_emscripten_futex_wake','_calloc','_sbrk']\"");
linkLine.Append(" c:\\Beef\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1"); linkLine.Append(" ", gApp.mInstallDir);
linkLine.Append("..\\..\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1");
String workingDir = scope String(); String workingDir = scope String();
if (!llvmDir.IsEmpty) if (!llvmDir.IsEmpty)