diff --git a/src/Config_ZigWindows.cake b/src/Config_ZigWindows.cake index 29d7f4d..56bd658 100644 --- a/src/Config_ZigWindows.cake +++ b/src/Config_ZigWindows.cake @@ -2,3 +2,5 @@ ;; (add-compiler-link-options "-target x86_64-windows-gnu") (comptime-define-symbol 'Windows) + +(import "Config_ZigCompile.cake") diff --git a/test/Build.sh b/test/Build.sh index 843824b..efdf2c1 100755 --- a/test/Build.sh +++ b/test/Build.sh @@ -14,4 +14,4 @@ cd ../.. CAKELISP=./Dependencies/cakelisp/bin/cakelisp -$CAKELISP src/Config_Linux.cake ../src/Config_ZigCompile.cake src/GameLibTests.cake --verbose-processes || exit $? +$CAKELISP src/Config_Linux.cake src/GameLibTests.cake --verbose-processes || exit $? diff --git a/test/BuildZig.sh b/test/BuildZig.sh new file mode 100755 index 0000000..364f190 --- /dev/null +++ b/test/BuildZig.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +CAKELISP_DIR=Dependencies/cakelisp + +# Link Cakelisp if necessary +[ ! -d "$CAKELISP_DIR" ] && git clone git@github.com:makuto/cakelisp.git Dependencies/cakelisp + +# Build Cakelisp itself +echo "\n\nCakelisp\n\n" +cd $CAKELISP_DIR +./Build.sh || exit $? + +cd ../.. + +CAKELISP=./Dependencies/cakelisp/bin/cakelisp + +$CAKELISP src/Config_Linux.cake ../src/Config_ZigCompile.cake src/GameLibZigCross.cake src/GameLibTests.cake --verbose-processes || exit $? diff --git a/test/src/GameLibTests.cake b/test/src/GameLibTests.cake index 2477f28..838eede 100644 --- a/test/src/GameLibTests.cake +++ b/test/src/GameLibTests.cake @@ -32,6 +32,8 @@ (comptime-cond ('Windows "src/Config_Windows.cake") + ('Zig-Windows + "../src/Config_ZigWindows.cake") (true "src/Config_Linux.cake"))) @@ -49,7 +51,6 @@ (gamelib-run-test "Auto Test (somewhat minimal)" (array platform-config - "../src/Config_ZigCompile.cake" "../src/Config_ZigWindows.cake" "../src/AutoTest.cake" "../src/Introspection.cake" "../src/Dictionary.cake" "../src/DynamicArray.cake" "../src/TaskSystem.cake" "../src/Image.cake" "../src/DataBundle.cake"))) diff --git a/test/src/GameLibZigCross.cake b/test/src/GameLibZigCross.cake new file mode 100644 index 0000000..910a31f --- /dev/null +++ b/test/src/GameLibZigCross.cake @@ -0,0 +1 @@ +(comptime-define-symbol 'Zig-Windows)