# HG changeset patch # User Sam # Date 1672234395 -25200 # Node ID dde536a70483989edd8125c3c284ecc3b588ab62 # Parent 1612f50b1bf6cd20ac6629ecd84140ec4d4ed91d add: windows builds diff -r 1612f50b1bf6 -r dde536a70483 .gitignore --- a/.gitignore Wed Dec 28 11:44:08 2022 +0700 +++ b/.gitignore Wed Dec 28 20:33:15 2022 +0700 @@ -1,9 +1,13 @@ +# nim directories nimcache/ nimblecache/ htmldocs/ +# custom build and download directories build/ thirdparty/ - testresults/ testresults.html + +# from windows build +*.pdb diff -r 1612f50b1bf6 -r dde536a70483 Makefile --- a/Makefile Wed Dec 28 11:44:08 2022 +0700 +++ b/Makefile Wed Dec 28 20:33:15 2022 +0700 @@ -2,8 +2,31 @@ COMPILE_OPTIONS := --path:src --mm:orc --experimental:strictEffects --threads:on --app:gui DEBUG_OPTIONS := --debugger:native --checks:on --assertions:on RELEASE_OPTIONS := -d:release --checks:off --assertions:off -WINDOWS_DEBUG_OPTIONS := --cc:vcc --passC:'/MDd' --passL:'ucrtd.lib' -WINDOWS_RELEASE_OPTIONS := --cc:vcc --passC:'/MD' --passL:'ucrt.lib' +WINDOWS_DEBUG_OPTIONS := --cc:vcc --passC:'/MDd' --passL:'ucrtd.lib' +WINDOWS_RELEASE_OPTIONS := --cc:vcc --passC:'/MD' --passL:'ucrt.lib' + +# HACK to get cross-compilation working -------------------------------- + +# anywhere with a windows filesystem that has the visual basic compiler tools installed +WINDOWS_BASE := /mnt + +# path variables, need to have correct versions +WINDOWS_PROGAMS := ${WINDOWS_BASE}/Program Files (x86) +MSVC_BUILDTOOLS_PATH := ${WINDOWS_PROGAMS}/Microsoft Visual Studio/2022/BuildTools/VC +WINDOWS_KIT_INCLUDE_BASE := ${WINDOWS_PROGAMS}/Windows Kits/10/Include/10.0.22000.0 +WINDOWS_KIT_LIBS_BASE := ${WINDOWS_PROGAMS}/Windows Kits/10/Lib/10.0.22000.0 +MSVC_PATH := ${MSVC_BUILDTOOLS_PATH}/Tools/MSVC/14.34.31933 + +MSVC_ADDITIONAL_PATH := ${MSVC_BUILDTOOLS_PATH}/Auxiliary/Build/ +CL_DIR := ${MSVC_PATH}/bin/Hostx64/x64/ +CL_INCL_DIR := ${MSVC_PATH}/include +WINE_NIM_VERSION := 1.6.10 + +# nim command: +WINE_NIM := WINEPATH="${CL_DIR}" wine ./build/nim_windows/nim-${WINE_NIM_VERSION}/bin/nim.exe --path:"${MSVC_ADDITIONAL_PATH}" --path:"${CL_INCL_DIR}" --passC:'/I "${CL_INCL_DIR}"' --passC:'/I "${WINDOWS_KIT_INCLUDE_BASE}/ucrt"' --passC:'/I "${WINDOWS_KIT_INCLUDE_BASE}/um"' --passC:'/I "${WINDOWS_KIT_INCLUDE_BASE}/shared"' --passL:'/LIBPATH:"${WINDOWS_KIT_LIBS_BASE}/ucrt/x64"' --passL:'/LIBPATH:"${WINDOWS_KIT_LIBS_BASE}/um/x64"' --passL:'/LIBPATH:"${MSVC_PATH}/lib/x64"' + +# end of HACK----------------------------------------------------------- + make_dirs: mkdir -p build/debug/linux @@ -16,28 +39,21 @@ nim c ${COMPILE_OPTIONS} ${DEBUG_OPTIONS} -o:$@ examples/hello_triangle.nim build/release/linux/hello_triangle: ${SOURCES} make_dirs nim c ${COMPILE_OPTIONS} ${RELEASE_OPTIONS} -o:$@ examples/hello_triangle.nim -build/debug/windows/hello_triangle.exe: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${DEBUG_OPTIONS} ${WINDOWS_DEBUG_OPTIONS} -o:$@ examples/hello_triangle.nim -build/release/windows/hello_triangle.exe: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${RELEASE_OPTIONS} ${WINDOWS_RELEASE_OPTIONS} -o:$@ examples/hello_triangle.nim +build/debug/windows/hello_triangle.exe: ${SOURCES} make_dirs build/nim_windows + ${WINE_NIM} c ${COMPILE_OPTIONS} ${DEBUG_OPTIONS} ${WINDOWS_DEBUG_OPTIONS} -o:$@ examples/hello_triangle.nim +build/release/windows/hello_triangle.exe: ${SOURCES} make_dirs build/nim_windows + ${WINE_NIM} c ${COMPILE_OPTIONS} ${RELEASE_OPTIONS} ${WINDOWS_RELEASE_OPTIONS} -o:$@ examples/hello_triangle.nim build_all_linux: build/debug/linux/hello_triangle build/release/linux/hello_triangle build_all_windows: build/debug/windows/hello_triangle.exe build/release/windows/hello_triangle.exe build_all: build_all_linux build_all_windows -# build maths (for testing) -build/debug/linux/maths: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${DEBUG_OPTIONS} -o:$@ examples/maths.nim -build/release/linux/maths: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${RELEASE_OPTIONS} -o:$@ examples/maths.nim -build/debug/windows/maths.exe: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${DEBUG_OPTIONS} ${WINDOWS_DEBUG_OPTIONS} -o:$@ examples/maths.nim -build/release/windows/maths.exe: ${SOURCES} make_dirs - nim c ${COMPILE_OPTIONS} ${RELEASE_OPTIONS} ${WINDOWS_RELEASE_OPTIONS} -o:$@ examples/maths.nim - +# clean clean: rm -rf build + # clean thirdparty too? +# tests tests: testament p tests/ @@ -51,7 +67,9 @@ publish_windows_release: build/release/linux/hello_triangle scp $< basx.dev:/var/www/public.basx.dev/joni/windows/release/ -publish_all: publish_linux_debug publish_linux_release publish_windows_debug publish_windows_release +publish_all_linux: publish_linux_debug publish_linux_release +publish_all_windows: publish_windows_debug publish_windows_release +publish_all: publish_all_linux publish_all_windows # download thirdparty-libraries @@ -59,33 +77,39 @@ thirdparty/lib/glslang/linux_debug: mkdir -p $@ wget --directory-prefix=$@ https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Debug.zip - unzip glslang-master-linux-Debug.zip + unzip glslang-master-linux-Debug.zip -d $@ thirdparty/lib/glslang/linux_release: mkdir -p $@ wget --directory-prefix=$@ https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip - unzip glslang-master-linux-Release.zip + unzip glslang-master-linux-Release.zip -d $@ thirdparty/lib/glslang/windows_debug: mkdir -p $@ wget --directory-prefix=$@ https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-windows-x64-Debug.zip - unzip glslang-master-windows-x64-Debug.zip + unzip glslang-master-windows-x64-Debug.zip -d $@ thirdparty/lib/glslang/windows_release: mkdir -p $@ wget --directory-prefix=$@ https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-windows-x64-Release.zip - unzip glslang-master-windows-x64-Release.zip + unzip glslang-master-windows-x64-Release.zip -d $@ thirdparty/lib/spirv-tools/linux_debug: mkdir -p $@ wget --directory-prefix=$@ https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-gcc-debug/continuous/1899/20221216-081758/install.tgz - tar -xf $@/install.tgz + tar --directory $@ -xf $@/install.tgz thirdparty/lib/spirv-tools/linux_release: mkdir -p $@ wget --directory-prefix=$@ https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-gcc-release/continuous/1889/20221216-081754/install.tgz - tar -xf $@/install.tgz + tar --directory $@ -xf $@/install.tgz thirdparty/lib/spirv-tools/windows_debug: mkdir -p $@ wget --directory-prefix=$@ https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/windows-msvc-2017-debug/continuous/1599/20221216-081803/install.zip - unzip $@/install.zip + unzip $@/install.zip -d $@ thirdparty/lib/spirv-tools/windows_release: mkdir -p $@ wget --directory-prefix=$@ https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/windows-msvc-2017-release/continuous/1885/20221216-081805/install.zip - unzip $@/install.zip + unzip $@/install.zip -d $@ + +# set up cross compilation to compile for windows on linux +build/nim_windows/: + mkdir -p build/nim_windows + wget --directory-prefix=$@ https://nim-lang.org/download/nim-${WINE_NIM_VERSION}_x64.zip + unzip $@/nim-${WINE_NIM_VERSION}_x64.zip -d $@