From df039b0864a6e297557c34bfbce3952acbe10016 Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Mon, 2 Mar 2026 20:38:47 +0100 Subject: [PATCH] windows fix --- build.cmd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build.cmd b/build.cmd index 2f26696..6c262c1 100644 --- a/build.cmd +++ b/build.cmd @@ -5,18 +5,20 @@ mkdir bin\executable-windows-msvc git clone https://github.com/KhronosGroup/glslang.git .\build\glslang -set useLibc=-nostdinc++ -nostdlib++ -isystem %LIBCXX_DIR%\include\c++\v1 -L %LIBCXX_DIR%\lib -lc++ +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 cd .\build\glslang -cmake -G Ninja -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="%useLibc%" -DCMAKE_EXE_LINKER_FLAGS="%useLibc%" -DCMAKE_SHARED_LINKER_FLAGS="%useLibc%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="%buildDir%" -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="%buildDir%" -DENABLE_OPT=OFF +cmake -G Ninja -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="%useLibcSource%" -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=-stdlib=libc++ -I./build -std=c++26 -O3 -march=native -mtune=native -fprebuilt-module-path=./build -D CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu -D CRAFTER_BUILD_CONFIGURATION_TYPE_EXECUTABLE -D CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu -D CRAFTER_BUILD_CONFIGURATION_TYPE_EXECUTABLE %useLibc% -c +set common_options=-I./build -std=c++26 -O3 -march=native -mtune=native -fprebuilt-module-path=./build -D CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu -D CRAFTER_BUILD_CONFIGURATION_TYPE_EXECUTABLE -D CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu -D CRAFTER_BUILD_CONFIGURATION_TYPE_EXECUTABLE %useLibcSource% -c -clang++ %useLibc% -std=c++26 -stdlib=libc++ -Wno-reserved-identifier -Wno-reserved-module-identifier --precompile %LIBCXX_DIR%\modules\c++\v1\std.cppm -o .\build\std.pcm +clang++ %useLibcSource% -std=c++26 -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-CompileStatus.cppm -o .\build\Crafter.Build-CompileStatus.o clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Command.cppm -o .\build\Crafter.Build-Command.o @@ -36,7 +38,7 @@ clang++ %common_options% .\implementations\Crafter.Build-Module.cpp -o .\build\C clang++ %common_options% .\implementations\Crafter.Build-Configuration.cpp -o .\build\Crafter.Build-Configuration_impl.o clang++ %common_options% .\implementations\Crafter.Build-Project.cpp -o .\build\Crafter.Build -clang++ %useLibc% -std=c++26 -stdlib=libc++ -O3 -march=native -mtune=native -L.\build -fuse-ld=lld -lSPIRV -GenericCodeGen -lglslang -lOSDependent -lMachineIndependent -lglslang-default-resource-limits .\build\Crafter.Build-Command.o .\build\Crafter.Build-CompileStatus.o .\build\Crafter.Build-Shader.o .\build\Crafter.Build-Module.o .\build\Crafter.Build-Configuration.o .\build\Crafter.Build-Project.o .\build\Crafter.Build.o .\build\Crafter.Build-Command_impl.o .\build\Crafter.Build-Shader_impl.o .\build\Crafter.Build-Module_impl.o .\build\Crafter.Build-Configuration_impl.o .\build\Crafter.Build-Project_impl.o .\build\Crafter.Build-Implementation.o .\build\Crafter.Build-Implementation_impl.o .\build\Crafter.Build-Test_impl.o .\build\Crafter.Build-Test.o .\build\main.o -o .\bin\executable-linux-gnu\crafter-build +clang++ %useLibcLinker% -std=c++26 -O3 -march=native -mtune=native -L.\build -fuse-ld=lld -lSPIRV -GenericCodeGen -lglslang -lOSDependent -lMachineIndependent -lglslang-default-resource-limits .\build\Crafter.Build-Command.o .\build\Crafter.Build-CompileStatus.o .\build\Crafter.Build-Shader.o .\build\Crafter.Build-Module.o .\build\Crafter.Build-Configuration.o .\build\Crafter.Build-Project.o .\build\Crafter.Build.o .\build\Crafter.Build-Command_impl.o .\build\Crafter.Build-Shader_impl.o .\build\Crafter.Build-Module_impl.o .\build\Crafter.Build-Configuration_impl.o .\build\Crafter.Build-Project_impl.o .\build\Crafter.Build-Implementation.o .\build\Crafter.Build-Implementation_impl.o .\build\Crafter.Build-Test_impl.o .\build\Crafter.Build-Test.o .\build\main.o -o .\bin\executable-linux-gnu\crafter-build xcopy "binlib\*" "bin\" /E /I /Y rmdir /S /Q "build" \ No newline at end of file