Browse Source

[CI] Enable cmake win32 build again (#783)

Yuxiao Mao 3 months ago
parent
commit
8bdadf6856
2 changed files with 12 additions and 4 deletions
  1. 0 4
      .github/workflows/build.yml
  2. 12 0
      CMakeLists.txt

+ 0 - 4
.github/workflows/build.yml

@@ -90,10 +90,6 @@ jobs:
           - target: windows
           - target: windows
             build_system: make
             build_system: make
 
 
-          - target: windows
-            architecture: 32
-            build_system: cmake
-
     steps:
     steps:
     - name: "SCM Checkout"
     - name: "SCM Checkout"
       uses: actions/checkout@v4
       uses: actions/checkout@v4

+ 12 - 0
CMakeLists.txt

@@ -202,11 +202,18 @@ if(BUILD_TESTING)
         haxe
         haxe
     )
     )
 
 
+    if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
+        SET(HAXE_FLAGS -D hl-legacy32)
+    else()
+        SET(HAXE_FLAGS )
+    endif()
+
     #####################
     #####################
     # hello.hl
     # hello.hl
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
     )
     )
@@ -219,6 +226,7 @@ if(BUILD_TESTING)
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
     )
     )
@@ -231,6 +239,7 @@ if(BUILD_TESTING)
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
             -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
             -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
     )
     )
@@ -243,6 +252,7 @@ if(BUILD_TESTING)
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello/hello.c
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello/hello.c
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello/hello.c
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello/hello.c
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
     )
     )
@@ -265,6 +275,7 @@ if(BUILD_TESTING)
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads/threads.c
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads/threads.c
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads/threads.c
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads/threads.c
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
             -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
     )
     )
@@ -287,6 +298,7 @@ if(BUILD_TESTING)
 
 
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample/uvsample.c
     add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample/uvsample.c
         COMMAND ${HAXE_COMPILER}
         COMMAND ${HAXE_COMPILER}
+            ${HAXE_FLAGS}
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample/uvsample.c
             -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample/uvsample.c
             -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
             -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
     )
     )