cross-compile onto Windows-x64

.gitignore

@@ -94,9 +94,9 @@ packages/
 
 #Test files
 *.testsettings
-/winbuild
-/build-*
-/build
+/winbuild/
+/build-*/
+/build/
 /run
 
 # Python stuf

build-windows-x64.sh

@@ -0,0 +1,30 @@
+# Build ntest for Windows-x64
+
+set -eu
+
+if ! [ -e src ]
+  then
+    echo "missing source directory. Run this from within the ntest directory."
+    return 1
+fi
+
+echo "---------------"
+echo "Compiling ntest"
+echo "---------------"
+
+mkdir -p build-windows-x64
+docker run -i \
+  -v `pwd`/src:/usr/src:ro \
+  -v `pwd`/build-windows-x64:/usr/build:rw \
+  -u `stat -c "%u:%g" build-windows-x64` \
+  thewtex/cross-compiler-windows-x64 <<EOF
+cd ../build
+cmake -DCMAKE_BUILD_TYPE=Release ../src
+make
+EOF
+
+echo
+echo "---------------"
+echo "BUILD SUCCEEDED"
+echo "---------------"
+

build.sh

@@ -1,3 +1,7 @@
+# Build ntest for the local machine
+
+set -eu
+
 if ! [ -e src ]
   then
     echo "missing source directory. Run this from within the ntest directory."
@@ -8,27 +12,15 @@ echo "---------------"
 echo "Compiling ntest"
 echo "---------------"
 
-mkdir build
+mkdir -p build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Release ../src
 make
+make test
+cd ..  # person who ran build.sh expects its working directory here
 
-echo "---------------------------------"
-echo "Copying ntest to run subdirectory"
-echo "---------------------------------"
-
-cd ..
-rm -rf run
-mkdir run
-cp build/ntest run
-cp -r resource/* run
-cp -r extras run
-cp -r instructions run
-
-echo "-------------"
-echo "Testing ntest"
-echo "-------------"
+echo
+echo "---------------"
+echo "BUILD SUCCEEDED"
+echo "---------------"
 
-cd run # ntest expects its working directory here
-./ntest t
-cd ..  # person who ran build.sh expects its working directory here

src/CMakeLists.txt

@@ -46,12 +46,6 @@ target_link_libraries(randomEvalGen mainlib core game patterns odk n64)
 add_test(ntest_basic ntest o)
 
 if(${UNIX})
-    EXEC_PROGRAM(ln ARGS -sf "${CMAKE_SOURCE_DIR}/../resource/coefficients"
-                 "${CMAKE_BINARY_DIR}")
-    EXEC_PROGRAM(ln ARGS -sf "${CMAKE_SOURCE_DIR}/../resource/TestGames.ggf"
-                 "${CMAKE_BINARY_DIR}")
-    EXEC_PROGRAM(ln ARGS -sf "${CMAKE_SOURCE_DIR}/../resource"
-                 "${CMAKE_BINARY_DIR}")
-    EXEC_PROGRAM(ln ARGS -sf "${CMAKE_SOURCE_DIR}/../resource/parameters.txt"
+    EXEC_PROGRAM(ln ARGS -sf "../src/resource/*"
                  "${CMAKE_BINARY_DIR}")
 endif()

win-x64.sh

@@ -0,0 +1,30 @@
+# Build ntest for Windows-x64
+# on Linux
+#
+# Uses a docker cross-compiler which is enormous (3GB), beware.
+#
+
+set -eu
+
+if ! [ -e src ]
+  then
+    echo "missing source directory. Run this from within the ntest directory."
+    return 1
+fi
+
+echo "---------------"
+echo "Compiling ntest"
+echo "---------------"
+
+mkdir -p build-windows-x64
+docker run -i -v `pwd`/src:/usr/src:ro -v `pwd`/build-windows-x64:/usr/build:rw thewtex/cross-compiler-windows-x64 <<EOF
+cd ../build
+cmake -DCMAKE_BUILD_TYPE=Release ../src
+make
+EOF
+
+echo
+echo "---------------"
+echo "BUILD SUCCEEDED"
+echo "---------------"
+