2
0
marauder2k7 2 жил өмнө
parent
commit
6eb051b5a4

+ 1 - 1
.github/workflows/cmake.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{matrix.os}}
     runs-on: ${{matrix.os}}
     strategy:
     strategy:
       matrix:
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest ]
 
 
     steps:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/checkout@v3

+ 1 - 0
Engine/source/CMakeLists.txt

@@ -16,6 +16,7 @@ forwardDef(TORQUE_SDL)
 if(TORQUE_TESTING)
 if(TORQUE_TESTING)
 set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TESTS_ENABLED)
 set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TESTS_ENABLED)
 set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} "_VARIADIC_MAX=10")
 set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} "_VARIADIC_MAX=10")
+set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_DISABLE_MEMORY_MANAGER)
 endif()
 endif()
 
 
 # On Windows we disable CRT Security warnings - this comes from recommendations to use non-portable functions.
 # On Windows we disable CRT Security warnings - this comes from recommendations to use non-portable functions.