Updated winsdk docker image. Updated integration tests engine versions

server/build-docker.sh

@@ -44,10 +44,11 @@ for request in $REQUESTED; do
             INSTALL="android $request"
             ;;
         windows)
-            INSTALL="wine winsdk-2022"
+            # skip building winsdk-2022 because wine image contains newer Clang. 
+            INSTALL="wine winsdk-2022_144435207"
             ;;
         xbox)
-            INSTALL="wine winsdk-2022 xbox-251001"
+            INSTALL="wine winsdk-2022_144435207 xbox-251001"
             ;;
         linux)
             INSTALL="linux"
@@ -72,7 +73,7 @@ for request in $REQUESTED; do
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_XBOX_PRIVATE_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker
             ;;
         wine)
-            DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.5.0 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker
+            DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.6.0 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker
             ;;
         android)
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.6.0 -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker

server/docker/Dockerfile.wine-env

@@ -60,15 +60,15 @@ RUN \
 #
 # llvm
 #
-ENV CLANG_VERSION=17
+ENV CLANG_VERSION=19
 RUN \
   echo "LLVM + CLANG ${CLANG_VERSION}" && \
   wget https://apt.llvm.org/llvm.sh && \
   chmod +x llvm.sh && \
   ./llvm.sh ${CLANG_VERSION} && \
   rm llvm.sh
 
-ENV CLANG_17_HOME=/usr/lib/llvm-${CLANG_VERSION}
+ENV CLANG_HOME=/usr/lib/llvm-${CLANG_VERSION}
 # Possibly get the "-resource-dir" from clang++ -### empty.cpp
-ENV CLANG_17_RESOURCE_DIR=/usr/lib/llvm-${CLANG_VERSION}/lib/clang/${CLANG_VERSION}
-ENV PATH=${CLANG_17_HOME}/bin:$PATH
+ENV CLANG_RESOURCE_DIR=/usr/lib/llvm-${CLANG_VERSION}/lib/clang/${CLANG_VERSION}
+ENV PATH=${CLANG_HOME}/bin:$PATH

server/docker/Dockerfile.winsdk.2022_144435207-env

@@ -0,0 +1,95 @@
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.6.0
+
+ENV PLATFORMSDK_WIN32=$PLATFORMSDK_DIR/Win32
+
+ENV \
+  WINDOWS_SDK_DIR=${PLATFORMSDK_WIN32}/WindowsKits/10 \
+  WINDOWS_SDK_VERSION=10.0.26100.0 \
+  WINDOWS_MSVC_VERSION=14.44.35207
+
+ENV \
+  VCINSTALLDIR="${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022/VC" \
+  VSINSTALLDIR="${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022" \
+  WINDOWS_MSVC_DIR="${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022/VC/Tools/MSVC/${WINDOWS_MSVC_VERSION}" \
+  WINDOWS_VCINSTALLDIR="${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022/VC/Tools/MSVC/${WINDOWS_MSVC_VERSION}" \
+  WINDOWS_VSINSTALLDIR="${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022"
+
+# windres: Allows for generating .res files that can be used during linking
+RUN \
+  echo "Win32 SDK - WINDRES" && \
+  apt-get update && \
+  apt-get install -y binutils-mingw-w64-x86-64 && \
+  ls -la /usr/bin/x86_64-w64-mingw32-windres && \
+  ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/local/bin/windres
+
+RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
+  echo "WIN32 2022 SDK  " && \
+  mkdir -p ${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022 && \
+  wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/Microsoft-Visual-Studio-2022-${WINDOWS_MSVC_VERSION}.tar.gz | tar xz -C ${PLATFORMSDK_WIN32}/MicrosoftVisualStudio2022
+
+RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
+  echo "WIN32 ${WINDOWS_SDK_VERSION} SDK  " && \
+  mkdir -p ${PLATFORMSDK_WIN32}/WindowsKits && \
+  wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/WindowsKits-${WINDOWS_SDK_VERSION}.tar.gz | tar xz -C ${PLATFORMSDK_WIN32}/WindowsKits
+
+RUN \
+  ln -s $(which clang) $(dirname $(which clang))/x86_64-pc-win32-clang && \
+  ln -s $(which llvm-ar) $(dirname $(which llvm-ar))/x86_64-pc-win32-clang-ar
+
+# Due to Windows' case insensitive file system, the sources reference lib files with wrong cases
+# so we solve the bulk by making the suffixes lowercase. (e.g. MyLib.Lib -> MyLib.lib)
+RUN find $PLATFORMSDK_WIN32 -iname '*.Lib' -type f -exec sh -c 'a=$(echo "$0" | sed -r "s/([^.]*)\$/\L\1/"); [ "$a" != "$0" ] && [ ! -f "$a" ] && ln -s "$0" "$a" ' {} \;
+
+COPY winsdk_rename_files.py ${PLATFORMSDK_WIN32}
+RUN \
+  echo "Renaming header files" && \
+  python ${PLATFORMSDK_WIN32}/winsdk_rename_files.py > ${PLATFORMSDK_WIN32}/rename.txt
+
+# Make a copy of all the headers too, in lower case (e.g. Windows.h -> windows.h etc)
+RUN find $PLATFORMSDK_WIN32 -iname '*.h' -type f -exec sh -c 'd=$(dirname "$0"); a=$(basename "$0" | tr [:upper:] [:lower:]); [ "$a" != $(basename "$0")  ] && [ ! -f "$d/$a" ] && ln -s "$0" "$d/$a" ' {} \;
+
+# Make lower case links of libraries as well
+RUN find ${WINDOWS_SDK_DIR}/Lib -iname '*.lib' -type f -exec sh -c 'd=$(dirname "$0"); a=$(basename "$0" | tr [:upper:] [:lower:]); [ "$a" != $(basename "$0")  ] && [ ! -f "$d/$a" ] && ln -s "$0" "$d/$a" ' {} \;
+
+RUN \
+  echo "WIN32 SDK - 2022 - Debug" && \
+# and the rest are manually copied (or made lower case)
+  echo ${WINDOWS_MSVC_DIR}
+
+
+RUN \
+  echo "WIN32 SDK - 2022 - Cleanup" && \
+# and the rest are manually copied (or made lower case)
+  (cd ${WINDOWS_MSVC_DIR}/lib/x64 && cp oldnames.lib OLDNAMES.lib) && \
+  (cd ${WINDOWS_MSVC_DIR}/lib/x86 && cp oldnames.lib OLDNAMES.lib) && \
+  (cd ${WINDOWS_MSVC_DIR}/lib/x64 && cp libcmt.lib LIBCMT.lib) && \
+  (cd ${WINDOWS_MSVC_DIR}/lib/x86 && cp libcmt.lib LIBCMT.lib) && \
+  (cd ${WINDOWS_MSVC_DIR}/lib/x64 && cp delayimp.lib Delayimp.lib) && \
+  (cd ${WINDOWS_MSVC_DIR}/lib/x86 && cp delayimp.lib Delayimp.lib)
+
+# Some headers are named by the wrong name in the windows sdk's...
+# We need to make certain names lowercase because some users
+# have put "pragma lib" comments in some libraries :(
+# and/or misspelled header files
+RUN \
+  echo "WIN32 WindowsKits ${WINDOWS_SDK_VERSION} - Cleanup" && \
+  (cd ${WINDOWS_SDK_DIR}/Include/${WINDOWS_SDK_VERSION}/shared && cp driverspecs.h DriverSpecs.h) && \
+  (cd ${WINDOWS_SDK_DIR}/Include/${WINDOWS_SDK_VERSION}/shared && cp specstrings.h SpecStrings.h) && \
+  (cd ${WINDOWS_SDK_DIR}/Include/${WINDOWS_SDK_VERSION}/shared && cp concurrencysal.h ConcurrencySal.h) && \
+  (cd ${WINDOWS_SDK_DIR}/Include/${WINDOWS_SDK_VERSION}/shared && cp wlantypes.h WlanTypes.h) && \
+  (cd ${WINDOWS_SDK_DIR}/Lib/${WINDOWS_SDK_VERSION}/um/x64 && cp psapi.lib Psapi.lib) && \
+  (cd ${WINDOWS_SDK_DIR}/Lib/${WINDOWS_SDK_VERSION}/um/x86 && cp psapi.lib Psapi.lib)
+
+# Also, the OpenGL headers in the windows SDK is in a folder with lower case letters, which doesn't match the includes
+RUN \
+  echo "WIN32 WindowsKits ${WINDOWS_SDK_VERSION} - OpenGL Cleanup" && \
+  cd ${WINDOWS_SDK_DIR}/Include/${WINDOWS_SDK_VERSION}/um && \
+  mkdir ./GL && \
+  cp -v ./gl/*.* ./GL/
+
+# Since dotnet cannot really cross compile, we need to create a "lib" shim for "wine lib.exe"
+# As long as it's in the path, it will be picked up
+RUN \
+  echo '#!/usr/bin/env bash' > /usr/bin/lib && \
+  echo 'wine ${WINDOWS_VCINSTALLDIR}/bin/Hostx64/x64/lib.exe $*' >> /usr/bin/lib && \
+  chmod +x /usr/bin/lib

server/docker/Dockerfile.xbox.251001-env

@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022_144435207-env:latest
 
 ENV XBOX_SDK_VERSION=251001
 ENV XBOX_SDK=${PLATFORMSDK_DIR}/xbox-sdk-${XBOX_SDK_VERSION}

server/docker/docker-compose.yml

@@ -174,6 +174,20 @@ services:
       default:
         aliases:
           - winsdk-2022
+  win_2022_144435207-dev:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022_144435207-env:latest
+    extends:
+      file: common-services.yml
+      service: remote_builder
+    environment:
+      - INSTANCE_ID=winsdk-2022_144435207-local
+    profiles:
+      - all
+      - windows
+    networks:
+      default:
+        aliases:
+          - winsdk-2022_144435207
   xbox_251001-dev:
     image: europe-west1-docker.pkg.dev/extender-426409/extender-xbox-private-registry/extender-xbox-251001-env:latest
     extends:
@@ -279,6 +293,17 @@ services:
       default:
         aliases:
           - winsdk-2022
+  win_2022_144435207-integration-test:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022_144435207-env:latest
+    extends:
+      file: common-services.yml
+      service: test_remote_builder
+    profiles:
+      - test
+    networks:
+      default:
+        aliases:
+          - winsdk-2022_144435207
 
 # linux service for auth testing
   frontend-auth-test:

server/src/test/java/com/defold/extender/IntegrationTest.java

@@ -112,18 +112,16 @@ public static List<TestConfiguration> data() {
         DefoldVersion[] versions = {
                 // "a" is a made up sdk where we can more easily test build.yml fixes
                 // new DefoldVersion("a", new Version(0, 0, 0), new String[] {"armv7-android", "x86_64-win32"} ),
-
-                // // 2025-04-14 https://github.com/defold/defold/releases/tag/1.10.0
-                new DefoldVersion("591eb496d52f4140bc2c7de547131f1b9408b9b4", new Version(1, 10, 0), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-
-                // // 2024-05-14 https://github.com/defold/defold/releases/tag/1.10.1
-                new DefoldVersion("d8e6e73a8efac6b9a72783027867e547b6a363e4", new Version(1, 10, 1), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2024-06-11 https://github.com/defold/defold/releases/tag/1.10.2
-                new DefoldVersion("7a0e23b3fcab4c5db82f2b32f5d8ac5df9467c9d", new Version(1, 10, 2), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2025-07-07 https://github.com/defold/defold/releases/tag/1.10.3
-                new DefoldVersion("1c76521bb8b08c63ef619aa8a5ab563dddf7b3cf", new Version(1, 10, 3), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2025-08-04 https://github.com/defold/defold/releases/tag/1.10.4
-                new DefoldVersion("1aafd0a262ff40214ed7f51302d92fa587c607ef", new Version(1, 10, 4), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // https://github.com/defold/defold/releases/tag/1.11.1
+                new DefoldVersion("758dfc0ea71dca26d169fddd0c5a1bc6dd0be4b3", new Version(1, 11, 1), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // https://github.com/defold/defold/releases/tag/1.11.2
+                new DefoldVersion("cddb6eb43c32e4930257fcbbb30f19cf28deb081", new Version(1, 11, 2), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // https://github.com/defold/defold/releases/tag/1.12.0
+                new DefoldVersion("3206f699aaff89f357c9d549050b8453e080c5d2", new Version(1, 12, 0), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // https://github.com/defold/defold/releases/tag/1.12.1
+                new DefoldVersion("16c6fd602f32de4814660672c38ce3ccbbc1fb59", new Version(1, 12, 1), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // https://github.com/defold/defold/releases/tag/1.12.2
+                new DefoldVersion("e43be333aa7a4fc319ab62adc8d405c8e98bf92f", new Version(1, 12, 2), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"})
                 // Use test-data/createdebugsdk.sh to package your preferred platform sdk and it ends up in the sdk/debugsdk folder
                 // Then you can write your tests without waiting for the next release
                 //new DefoldVersion("debugsdk", new Version(1, 2, 104), new String[] {"js-web"}),

server/test-data/compile.sh

@@ -30,8 +30,8 @@ OSX_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault26.2.xctoolchain/usr/bin/ar
 OSX_MIN_VERSION=11.5
 OSX_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/MacOSX25.2.sdk
 
-EMCC=$DYNAMO_HOME/ext/SDKs/emsdk-3.1.65/upstream/emscripten/em++
-EMAR=$DYNAMO_HOME/ext/SDKs/emsdk-3.1.65/upstream/emscripten/emar
+EMCC=$DYNAMO_HOME/ext/SDKs/emsdk-4.0.6/upstream/emscripten/em++
+EMAR=$DYNAMO_HOME/ext/SDKs/emsdk-4.0.6/upstream/emscripten/emar
 
 WIN32_CL=cl.exe
 WIN32_LIB=lib.exe
@@ -209,18 +209,18 @@ function CompileWindowsOnDarwin {
 		RemoveTarget $target
 		mkdir -p $(dirname $target)
 
-		local INCLUDES="-I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/include -I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/include -I${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Include/10.0.20348.0/ucrt -I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/Tools/MSVC/14.37.32822/include"
+		local INCLUDES="-I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/include -I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/include -I${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Include/10.0.26100.0/ucrt -I${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/Tools/MSVC/14.44.35207/include"
 		local DEFINES="-DDM_PLATFORM_WINDOWS -D_CRT_SECURE_NO_WARNINGS -D__STDC_LIMIT_MACROS -DWINVER=0x0600 -DWIN32"
 		local FLAGS="-O2 -Wall -Werror=format -fvisibility=hidden -g" # -codeview
 		local ARCH_FLAGS=""
 		local LIB_PATHS=""
 
 		if [ "$arch" == "x86_64" ]; then
 			ARCH_FLAGS="-target x86_64-pc-win32-msvc -m64"
-			#LIB_PATHS="-L${DYNAMO_HOME}/ext/SDKs/Win32/lib/x86_64-win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/ext/lib/x86_64-win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/lib/amd64 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/lib/amd64 -L${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Lib/10.0.20348.0/ucrt/x64"
+			#LIB_PATHS="-L${DYNAMO_HOME}/ext/SDKs/Win32/lib/x86_64-win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/ext/lib/x86_64-win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/lib/amd64 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/lib/amd64 -L${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Lib/10.0.26100.0/ucrt/x64"
 		else
 			ARCH_FLAGS="-target i386-pc-win32-msvc -m32"
-			#LIB_PATHS="-L${DYNAMO_HOME}/ext/SDKs/Win32/lib/win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/ext/lib/win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/lib/ -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/lib -L${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Lib/10.0.20348.0/ucrt/x86"
+			#LIB_PATHS="-L${DYNAMO_HOME}/ext/SDKs/Win32/lib/win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/ext/lib/win32 -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/lib/ -L${DYNAMO_HOME}/ext/SDKs/Win32/MicrosoftVisualStudio14.0/VC/atlmfc/lib -L${DYNAMO_HOME}/ext/SDKs/Win32/WindowsKits/10/Lib/10.0.26100.0/ucrt/x86"
 		fi
 
 		echo $WIN32_GCC $ARCH_FLAGS $FLAGS $LIBPATHS $INCLUDES $LIB_PATHS $src -c -o /tmp/$name-$archname.o

server/test-data/sdk/a/defoldsdk/extender/build.yml

@@ -405,14 +405,14 @@ platforms:
     env:
         TMP:                "{{build_folder}}"
         TEMP:               "{{build_folder}}"
-        MSVC_DIR:           "{{env.WINDOWS_MSVC_DIR_2022}}"
-        VCINSTALLDIR:       "{{env.WINDOWS_VCINSTALLDIR_2022}}"
-        VSINSTALLDIR:       "{{env.WINDOWS_VSINSTALLDIR_2022}}"
-        SDK10_DIR:          "{{env.WINDOWS_SDK_10_DIR}}"
-        SDK10_VERSION:      "{{env.WINDOWS_SDK_10_20348_VERSION}}"
-        CLANG_HOME:         "{{env.CLANG_17_RESOURCE_DIR}}"
+        MSVC_DIR:           "{{env.WINDOWS_MSVC_DIR}}"
+        VCINSTALLDIR:       "{{env.WINDOWS_VCINSTALLDIR}}"
+        VSINSTALLDIR:       "{{env.WINDOWS_VSINSTALLDIR}}"
+        SDK_DIR:          "{{env.WINDOWS_SDK_DIR}}"
+        SDK_VERSION:      "{{env.WINDOWS_SDK_VERSION}}"
+        CLANG_HOME:         "{{env.CLANG_RESOURCE_DIR}}"
     context:
-        systemIncludes: ["{{env.CLANG_HOME}}/include", "{{env.MSVC_DIR}}/include", "{{env.MSVC_DIR}}/atlmfc/include", "{{env.SDK10_DIR}}/Include/{{env.SDK10_VERSION}}/ucrt", "{{env.SDK10_DIR}}/Include/{{env.SDK10_VERSION}}/winrt", "{{env.SDK10_DIR}}/Include/{{env.SDK10_VERSION}}/um", "{{env.SDK10_DIR}}/Include/{{env.SDK10_VERSION}}/shared"]
+        systemIncludes: ["{{env.CLANG_HOME}}/include", "{{env.MSVC_DIR}}/include", "{{env.MSVC_DIR}}/atlmfc/include", "{{env.SDK_DIR}}/Include/{{env.SDK_VERSION}}/ucrt", "{{env.SDK_DIR}}/Include/{{env.SDK_VERSION}}/winrt", "{{env.SDK_DIR}}/Include/{{env.SDK_VERSION}}/um", "{{env.SDK_DIR}}/Include/{{env.SDK_VERSION}}/shared"]
         engineLibs:     ["libengine","libengine_service","libmbedtls","libzip","libprofile","libremotery","libprofilerext","librecord","libgameobject","libddf","libresource","libgamesys","libgamesys_model","libgamesys_rig","libscript_box2d","libgraphics","libgraphics_transcoder_basisu","libbasis_transcoder","libphysics","libBulletDynamics","libBulletCollision","libplatform","libLinearMath","libBox2D","librender","librender_font_default","libscript","libluajit-5.1","libextension","libhid","libinput","libparticle","librig","libdlib", "libimage", "libglfw3","libgui","libcrashext","libliveupdate","libsound","vpx"]
         libs:           ["OpenGL32", "delayimp", "User32", "shell32", "Xinput9_1_0", "dinput8", "dxguid", "WS2_32", "iphlpapi", "DbgHelp", "AdvAPI32", "Psapi", "Gdi32", "ole32"]
         symbols:        []
@@ -436,7 +436,7 @@ platforms:
   x86_64-win32:
 
     context:
-        libPaths:   ["{{dynamo_home}}/lib/x86_64-win32", "{{dynamo_home}}/ext/lib/x86_64-win32", "{{env.MSVC_DIR}}/lib/x64", "{{env.MSVC_DIR}}/atlmfc/lib/x64", "{{env.SDK10_DIR}}/Lib/{{env.SDK10_VERSION}}/ucrt/x64", "{{env.SDK10_DIR}}/Lib/{{env.SDK10_VERSION}}/um/x64"]
+        libPaths:   ["{{dynamo_home}}/lib/x86_64-win32", "{{dynamo_home}}/ext/lib/x86_64-win32", "{{env.MSVC_DIR}}/lib/x64", "{{env.MSVC_DIR}}/atlmfc/lib/x64", "{{env.SDK_DIR}}/Lib/{{env.SDK_VERSION}}/ucrt/x64", "{{env.SDK_DIR}}/Lib/{{env.SDK_VERSION}}/um/x64"]
         defines:        ["DM_PLATFORM_WINDOWS", "_CRT_SECURE_NO_WARNINGS", "_CRT_USE_BUILTIN_OFFSETOF", "_WINSOCK_DEPRECATED_NO_WARNINGS", "__STDC_LIMIT_MACROS", "WINVER=0x0600", "WIN32", "NOMINMAX"]
         flags:          ["-target", "x86_64-pc-win32-msvc", "-m64", "-O2", "-g", "-gcodeview", "-O2", "-Wall", "-Werror=format", "-fvisibility=hidden", "-nostdinc++"]
         linkFlags:      ["-target", "x86_64-pc-win32-msvc", "-m64", "-O2", "-g", "-O2", "-fuse-ld=lld", "-Wl,/entry:mainCRTStartup", "-Wl,/safeseh:no"]
@@ -446,7 +446,7 @@ platforms:
 
   x86-win32:
     context:
-        libPaths:   ["{{dynamo_home}}/lib/win32","{{dynamo_home}}/ext/lib/win32","{{env.MSVC_DIR}}/lib/x86", "{{env.MSVC_DIR}}/atlmfc/lib/x86", "{{env.SDK10_DIR}}/Lib/{{env.SDK10_VERSION}}/ucrt/x86", "{{env.SDK10_DIR}}/Lib/{{env.SDK10_VERSION}}/um/x86"]
+        libPaths:   ["{{dynamo_home}}/lib/win32","{{dynamo_home}}/ext/lib/win32","{{env.MSVC_DIR}}/lib/x86", "{{env.MSVC_DIR}}/atlmfc/lib/x86", "{{env.SDK_DIR}}/Lib/{{env.SDK_VERSION}}/ucrt/x86", "{{env.SDK_DIR}}/Lib/{{env.SDK_VERSION}}/um/x86"]
         defines:        ["DM_PLATFORM_WINDOWS", "LUA_BYTECODE_ENABLE_32", "_CRT_SECURE_NO_WARNINGS", "_CRT_USE_BUILTIN_OFFSETOF", "_WINSOCK_DEPRECATED_NO_WARNINGS", "__STDC_LIMIT_MACROS", "WINVER=0x0600", "WIN32", "NOMINMAX"]
         flags:          ["-target", "i386-pc-win32-msvc", "-m32", "-O2", "-g", "-gcodeview", "-Wall", "-Werror=format", "-fvisibility=hidden", "-nostdinc++"]
         linkFlags:      ["-target", "i386-pc-win32-msvc", "-m32", "-O2", "-g", "-fuse-ld=lld", "-Wl,/entry:mainCRTStartup", "-Wl,/safeseh:no"]