TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix mac compile

Browse source
This commit is contained in:
AzaezelX 2023-06-04 12:45:55 -05:00
parent 1194f7f49d
commit db3e7984ad
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/CMakeLists.txt
View file

@ -47,7 +47,7 @@ if (APPLE)
addFramework("IOKit") addFramework("IOKit")
#grrr damn you sdl! #grrr damn you sdl!
addFramework("Carbon") addFramework("Carbon")
addLib("iconv") set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} iconv)
if(NOT TORQUE_DEDICATED) if(NOT TORQUE_DEDICATED)
addFramework("OpenGL") addFramework("OpenGL")
addFramework("CoreVideo") addFramework("CoreVideo")

5
Tools/CMake/torque_configs.cmake
View file

@ -17,6 +17,11 @@ set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING T
set(TORQUE_LINK_LIBRARIES tinyxml collada ljpeg squish png_static opcode assimp set(TORQUE_LINK_LIBRARIES tinyxml collada ljpeg squish png_static opcode assimp
SDL2 glad pcre convexDecomp zlib) SDL2 glad pcre convexDecomp zlib)
if(NOT WIN32)
set(WIN32 OFF CACHE Bool "" FORCE)
endif()
mark_as_advanced(WIN32)
#general #general
advanced_option(TORQUE_MULTITHREAD "Multi Threading" ON) advanced_option(TORQUE_MULTITHREAD "Multi Threading" ON)
advanced_option(TORQUE_DISABLE_MEMORY_MANAGER "Disable memory manager" ON) advanced_option(TORQUE_DISABLE_MEMORY_MANAGER "Disable memory manager" ON)