diff --git a/ComputeEngine b/ComputeEngine index d84a7a9..b7a9ac3 160000 --- a/ComputeEngine +++ b/ComputeEngine @@ -1 +1 @@ -Subproject commit d84a7a93da7c7b6c60ed044f25add70b1cd13352 +Subproject commit b7a9ac3e937b8946ec581cdf980dbb29f9056b76 diff --git a/build.nu b/build.nu index c81ae8e..22ab502 100755 --- a/build.nu +++ b/build.nu @@ -1 +1,4 @@ -rm -rf cmake-build-debug try return 0 ; rm -fr build try return 0 ; cmake -B build -S . ; cmake --build build --config Release +rm -rf cmake-build-debug try return 0 +rm -fr build try return 0 +cmake -B build -S . +cmake --build build --config Release diff --git a/make_all.bat b/make_all.bat index b7e9212..06b8f95 100644 --- a/make_all.bat +++ b/make_all.bat @@ -1,9 +1,9 @@ @echo off set ComputeEngine_ROOT=%CD%/ComputeEngine -set vcpkg_ROOT=C:\Desktop\git\vcpkg\scripts\buildsystems\vcpkg.cmake +set vcpkg_ROOT=%1 -cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static +cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% cmake --build ComputeEngine/build --config Release -cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% -DVCPKG_TARGET_TRIPLET=x64-windows-static -cmake --build build --config Release \ No newline at end of file +cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_ROOT% +cmake --build build --config Release diff --git a/make_all.sh b/make_all.sh new file mode 100755 index 0000000..b81e73f --- /dev/null +++ b/make_all.sh @@ -0,0 +1,7 @@ +ComputeEngine_ROOT=$(dirname $0)/ComputeEngine +vcpkg_ROOT=$1 + +cmake -B ComputeEngine/build -S ComputeEngine -DCMAKE_TOOLCHAIN_FILE=$vcpkg_ROOT +cmake --build ComputeEngine/build --config Release +cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$vcpkg_ROOT +cmake --build build --config Release