Update files to support Win on ARM32

pahaze · pahaze · commit 606da1e3f8bd · 2022-08-25T20:21:38.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,20 +147,10 @@ set(BUILD_ARCH "unknown")
 if (CMAKE_GENERATOR_PLATFORM)
     set(BUILD_ARCH "${CMAKE_GENERATOR_PLATFORM}")
 endif()
-if(arch_lower MATCHES "arm64" OR arch_lower MATCHES "aarch64" OR ${CMAKE_GENERATOR} MATCHES "(ARM64)" OR ${BUILD_ARCH} MATCHES "(ARM64)")
-    set(DEPENDENCIES "dependencies-win-aarch64")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(DEPENDENCIES "dependencies-win-x86_64")
-else()
-    set(DEPENDENCIES "dependencies-win-i686")
-endif()
 
 if(WIN32)
     ADD_DEFINITIONS(-DUNICODE)
     ADD_DEFINITIONS(-D_UNICODE)
-    if(NOT IS_DIRECTORY "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}")
-        message(FATAL_ERROR "Dependencies directory not found, make sure dependencies-win-(arch) exists inside stk-code directory.")
-    endif()
 endif()
 
 # These variables enable MSVC to find libraries located in "dependencies"
@@ -822,10 +812,6 @@ endif()
 
 if(MSVC OR MINGW)
   target_link_libraries(supertuxkart iphlpapi.lib)
-  add_custom_command(TARGET supertuxkart POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "${PROJECT_SOURCE_DIR}/${DEPENDENCIES}/bin"
-        $<TARGET_FILE_DIR:supertuxkart>)
   add_custom_target(stkshaders SOURCES ${STK_SHADERS})
 endif()
 
@@ -893,9 +879,9 @@ endif()
 
 # ==== Install target ====
 install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
-install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
+install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 if(STK_ASSETS_DIR AND CHECK_ASSETS)
-  install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
+  install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 endif()
 install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
 install(FILES data/supertuxkart_16.png DESTINATION share/icons/hicolor/16x16/apps RENAME supertuxkart.png)
diff --git a/README.md b/README.md
@@ -1,4 +1,25 @@
-# SuperTuxKart
+# SuperTuxKart - for Windows on ARM32
+
+SuperTuxKart is a free kart racing game. It focuses on fun and not on realistic kart physics. Instructions can be found on the in-game help page.
+
+The SuperTuxKart homepage can be found at <https://supertuxkart.net/>. There is also our [FAQ](https://supertuxkart.net/FAQ) and information on how get in touch with the [community](https://supertuxkart.net/Community).
+
+Latest release binaries can be found [here](https://download.pahaze.net/ARM/).
+
+## Building
+Building for Windows on ARM32 is very straightforward. Build all needed dependencies with MXE, then clone the 2 projects (stk-assets, stk-code) as normal. In stk-code, run a general CMake setup:
+
+```sh
+mkdir build
+cd build
+armv7-w64-mingw32-cmake -DUSE_DIRECTX=ON -DSPIRV_TOOLS_BUILD_STATIC=OFF ..
+```
+
+Then from there, build as normal and install! The data dir was set to move to where it should be by default for Windows.
+
+# Original README
+
+## SuperTuxKart
 [![Linux build status](https://github.com/supertuxkart/stk-code/actions/workflows/linux.yml/badge.svg)](https://github.com/supertuxkart/stk-code/actions/workflows/linux.yml)
 [![Apple build status](https://github.com/supertuxkart/stk-code/actions/workflows/apple.yml/badge.svg)](https://github.com/supertuxkart/stk-code/actions/workflows/apple.yml)
 [![Windows build status](https://github.com/supertuxkart/stk-code/actions/workflows/windows.yml/badge.svg)](https://github.com/supertuxkart/stk-code/actions/workflows/windows.yml)
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
@@ -712,15 +712,9 @@ namespace UserConfigParams
         PARAM_DEFAULT(  FloatUserConfigParam(3, "font_size",
         &m_video_group, "The size of fonts. 0 is the smallest and 6 is the biggest") );
 
-#if defined(_IRR_COMPILE_WITH_DIRECT3D_9_) && defined(_M_ARM64)
     PARAM_PREFIX StringUserConfigParam         m_render_driver
         PARAM_DEFAULT(  StringUserConfigParam("directx9", "render_driver",
-        &m_video_group, "Render video driver to use, at the moment gl or directx9 is supported.") );
-#else
-    PARAM_PREFIX StringUserConfigParam         m_render_driver
-        PARAM_DEFAULT(  StringUserConfigParam("gl", "render_driver",
-        &m_video_group, "Render video driver to use, at the moment gl or directx9 is supported.") );
-#endif
+        &m_video_group, "Render video driver to use, only use directx9, gl doesn't work.") );
 
     // ---- Recording
     PARAM_PREFIX GroupUserConfigParam        m_recording_group
diff --git a/src/utils/crash_reporting.cpp b/src/utils/crash_reporting.cpp
@@ -240,22 +240,7 @@
                 stackframe.AddrPC.Mode      = AddrModeFlat;
                 stackframe.AddrStack.Mode   = AddrModeFlat;
                 stackframe.AddrFrame.Mode   = AddrModeFlat;
-#if defined(_M_ARM64)
-                stackframe.AddrPC.Offset    = pContext->Pc;
-                stackframe.AddrStack.Offset = pContext->Sp;
-                stackframe.AddrFrame.Offset = pContext->Fp;
-                const DWORD machine_type    = IMAGE_FILE_MACHINE_ARM64;
-#elif defined(_WIN64)
-                stackframe.AddrPC.Offset    = pContext->Rip;
-                stackframe.AddrStack.Offset = pContext->Rsp;
-                stackframe.AddrFrame.Offset = pContext->Rbp;
-                const DWORD machine_type    = IMAGE_FILE_MACHINE_AMD64;
-#else
-                stackframe.AddrPC.Offset    = pContext->Eip;
-                stackframe.AddrStack.Offset = pContext->Esp;
-                stackframe.AddrFrame.Offset = pContext->Ebp;
-                const DWORD machine_type = IMAGE_FILE_MACHINE_I386;
-#endif
+                const DWORD machine_type = IMAGE_FILE_MACHINE_ARM;
 
 
                 // Walk the stack
