Jorijn van der Graaf
eaee502e8c
Some checks failed
CI / build-test-release (pull_request) Failing after 44s
WASI / wasm32 target support
- Auto-detect /usr/share/wasi-sysroot on Linux when target starts_with("wasm32")
- Skip -march/-mtune for wasm (clang rejects them)
- Apply -fno-exceptions -fno-c++-static-destructors -mllvm -wasm-enable-sjlj
-D_WASI_EMULATED_SIGNAL to wasm builds (compile + std PCM, kept in sync)
- .wasm output extension in expectedOutputFor and link command
- EnableWasiBrowserRuntime(cfg): opt-in helper that drops index.html +
runtime.js next to the .wasm; runtime.js reads window.CRAFTER_WASM_URL
set in the templated index.html so a single shim handles any output name
-r run flag in the CLI: build then exec the artifact (host targets only;
rejects libraries; auto .exe/.wasm extension handling)
CI pipeline (.forgejo/workflows/ci.yaml)
- Triggers: PR/push to master + manual dispatch
- Single arch-latest container job: install deps, bootstrap, self-rebuild,
run tests, cross-compile mingw, package both archives, upload artifacts
- Rolling 'latest' release published only on push/dispatch to master
mingw cross-compile from Linux now works end-to-end:
- ExternalDependency cache key includes target so per-target glslang builds
don't collide; CMAKE_BUILD_TYPE=Release pinned (otherwise glslang appends
'd' to lib names and breaks linking); cross-compile cmake flags
(CMAKE_SYSTEM_NAME=Windows, CMAKE_*_COMPILER_TARGET=...)
- project.cpp accepts --target=<triple>; Linux-only -Wl,--export-dynamic
and -ldl are gated; mingw glslang skips the standalone exe (its libgcc_eh
link pulls pthread which mingw doesn't link by default)
- mingw compile uses -femulated-tls so std::__once_callable etc reference
the same emutls symbols libstdc++ provides
- mingw link auto-adds -lstdc++exp -lpthread
GetCrafterBuildHome() exposed from the Platform module; LoadProject (Linux
+ Windows) now both use it instead of duplicating the resolution.
Examples reorg: hello-world, library, with-module, wasi, tests — each with
its own README. Tests reorg: per-test directory with inner/ fixture, no
shared tests/fixtures/ tree. New Wasi test verifies .wasm magic bytes.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
112 lines
6 KiB
Batchfile
112 lines
6 KiB
Batchfile
@echo OFF
|
|
mkdir build 2>nul
|
|
mkdir bin 2>nul
|
|
mkdir lib 2>nul
|
|
mkdir share\crafter-build 2>nul
|
|
mkdir share\crafter-build\wasi-runtime 2>nul
|
|
|
|
copy /Y wasi-runtime\runtime.js share\crafter-build\wasi-runtime\
|
|
copy /Y wasi-runtime\index.html.in share\crafter-build\wasi-runtime\
|
|
|
|
copy /Y interfaces\Crafter.Build.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Shader.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Platform.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Interface.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Implementation.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-External.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Clang.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Test.cppm share\crafter-build\
|
|
copy /Y interfaces\Crafter.Build-Api.h share\crafter-build\
|
|
|
|
if not exist .\build\glslang\NUL git clone https://github.com/KhronosGroup/glslang.git .\build\glslang
|
|
|
|
set useLibcCommon=-nostdinc++ -nostdlib++
|
|
set useLibcLinker=-L %LIBCXX_DIR%\lib -lc++ %useLibcCommon%
|
|
set useLibcSource=-isystem %LIBCXX_DIR%\include\c++\v1 %useLibcCommon%
|
|
set buildDir=%CD%\build
|
|
|
|
if "%CRAFTER_BUILD_MARCH%"=="" set CRAFTER_BUILD_MARCH=native
|
|
if "%CRAFTER_BUILD_MTUNE%"=="" set CRAFTER_BUILD_MTUNE=native
|
|
|
|
cd .\build\glslang
|
|
cmake -G Ninja -B build ^
|
|
-DCMAKE_C_COMPILER=clang ^
|
|
-DCMAKE_CXX_COMPILER=clang++ ^
|
|
-DCMAKE_CXX_FLAGS="%useLibcSource%" ^
|
|
-DCMAKE_EXE_LINKER_FLAGS="%useLibcLinker%" ^
|
|
-DCMAKE_SHARED_LINKER_FLAGS="%useLibcLinker%" ^
|
|
-DCMAKE_BUILD_TYPE=Release ^
|
|
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="%buildDir%" ^
|
|
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY="%buildDir%" ^
|
|
-DENABLE_OPT=OFF
|
|
cmake --build build --config Release
|
|
cd ..\..\
|
|
|
|
set common_options=-I.\build\glslang -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAFTER_BUILD_MTUNE% -fprebuilt-module-path=.\build -D CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc -D CRAFTER_BUILD_CONFIGURATION_TYPE_EXECUTABLE -D _CRT_SECURE_NO_WARNINGS %useLibcSource% -c
|
|
|
|
clang++ %useLibcSource% -std=c++26 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAFTER_BUILD_MTUNE% -O3 -Wno-reserved-identifier -Wno-reserved-module-identifier --precompile %LIBCXX_DIR%\modules\c++\v1\std.cppm -o .\build\std.pcm
|
|
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Shader.cppm -o .\build\Crafter.Build-Shader.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Platform.cppm -o .\build\Crafter.Build-Platform.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Interface.cppm -o .\build\Crafter.Build-Interface.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Implementation.cppm -o .\build\Crafter.Build-Implementation.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-External.cppm -o .\build\Crafter.Build-External.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Clang.cppm -o .\build\Crafter.Build-Clang.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Test.cppm -o .\build\Crafter.Build-Test.o
|
|
clang++ %common_options% -fmodule-output interfaces\Crafter.Build.cppm -o .\build\Crafter.Build.o
|
|
|
|
clang++ %common_options% .\implementations\Crafter.Build-Shader.cpp -o .\build\Crafter.Build-Shader_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-Platform.cpp -o .\build\Crafter.Build-Platform_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-Interface.cpp -o .\build\Crafter.Build-Interface_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-Implementation.cpp -o .\build\Crafter.Build-Implementation_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-External.cpp -o .\build\Crafter.Build-External_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-Clang.cpp -o .\build\Crafter.Build-Clang_impl.o
|
|
clang++ %common_options% .\implementations\Crafter.Build-Test.cpp -o .\build\Crafter.Build-Test_impl.o
|
|
clang++ %common_options% .\implementations\main.cpp -o .\build\main.o
|
|
|
|
REM Step 1: link all impl .o files into crafter-build.dll, generating crafter-build.lib import lib
|
|
clang++ %useLibcLinker% -shared -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAFTER_BUILD_MTUNE% -L.\build -fuse-ld=lld ^
|
|
-Wl,/IMPLIB:.\bin\crafter-build.lib ^
|
|
-lSPIRV -lGenericCodeGen -lglslang -lOSDependent -lMachineIndependent -lglslang-default-resource-limits ^
|
|
.\build\Crafter.Build-Shader.o ^
|
|
.\build\Crafter.Build-Platform.o ^
|
|
.\build\Crafter.Build-Interface.o ^
|
|
.\build\Crafter.Build-Implementation.o ^
|
|
.\build\Crafter.Build-External.o ^
|
|
.\build\Crafter.Build-Clang.o ^
|
|
.\build\Crafter.Build-Test.o ^
|
|
.\build\Crafter.Build.o ^
|
|
.\build\Crafter.Build-Shader_impl.o ^
|
|
.\build\Crafter.Build-Platform_impl.o ^
|
|
.\build\Crafter.Build-Interface_impl.o ^
|
|
.\build\Crafter.Build-Implementation_impl.o ^
|
|
.\build\Crafter.Build-External_impl.o ^
|
|
.\build\Crafter.Build-Clang_impl.o ^
|
|
.\build\Crafter.Build-Test_impl.o ^
|
|
-o .\bin\crafter-build.dll
|
|
|
|
REM Step 2: link the launcher exe against crafter-build.lib
|
|
clang++ %useLibcLinker% -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAFTER_BUILD_MTUNE% -L.\bin -fuse-ld=lld ^
|
|
.\build\main.o ^
|
|
.\bin\crafter-build.lib ^
|
|
-o .\bin\crafter-build.exe
|
|
|
|
REM Step 3: bundle the same .o set as a static archive for downstream consumers
|
|
llvm-lib.exe /OUT:.\lib\crafter-build-static.lib ^
|
|
.\build\Crafter.Build-Shader.o ^
|
|
.\build\Crafter.Build-Platform.o ^
|
|
.\build\Crafter.Build-Interface.o ^
|
|
.\build\Crafter.Build-Implementation.o ^
|
|
.\build\Crafter.Build-External.o ^
|
|
.\build\Crafter.Build-Clang.o ^
|
|
.\build\Crafter.Build-Test.o ^
|
|
.\build\Crafter.Build.o ^
|
|
.\build\Crafter.Build-Shader_impl.o ^
|
|
.\build\Crafter.Build-Platform_impl.o ^
|
|
.\build\Crafter.Build-Interface_impl.o ^
|
|
.\build\Crafter.Build-Implementation_impl.o ^
|
|
.\build\Crafter.Build-External_impl.o ^
|
|
.\build\Crafter.Build-Clang_impl.o ^
|
|
.\build\Crafter.Build-Test_impl.o
|
|
|
|
copy /Y "%LIBCXX_DIR%\lib\c++.dll" ".\bin\c++.dll"
|