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

* BugFix: Correct convexDecomp compilation by setting the LINUX flag when necessary.

Browse source 
* BugFix: Update OpenAL to correct a compilation error on Linux.
This commit is contained in:
Robert MacGregor 2022-05-30 16:32:45 -04:00
parent e071f1d901
commit 7380161054
234 changed files with 30864 additions and 7523 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/CMakeLists.txt
View file

@ -126,9 +126,14 @@ file(GLOB TORQUE_I18N_SOURCES "i18n/*.cpp")
# Begin handling platform specific stuff
# Handle Platform POSIX
if (UNIX)
if (UNIX AND NOT APPLE)
file(GLOB TORQUE_PLATFORM_POSIX_SOURCES "platformPOSIX/*.cpp")
endif (UNIX)
if (TORQUE_CPU_X32 OR TORQUE_CPU_X64)
file(GLOB TORQUE_PLATFORM_X86_UNIX_SOURCES "platformX86UNIX/*.cpp")
set(TORQUE_PLATFORM_POSIX_SOURCES ${TORQUE_PLATFORM_POSIX_SOURCES} ${TORQUE_PLATFORM_X86_UNIX_SOURCES})
endif (TORQUE_CPU_X32 OR TORQUE_CPU_X64)
endif (UNIX AND NOT APPLE)
# Handle platformMac
if (APPLE)
@ -143,6 +148,11 @@ endif (WIN32)
# Handle platformSDL
file(GLOB TORQUE_PLATFORM_SDL_SOURCES "platformSDL/*.cpp" "platformSDL/threads/*.cpp")
# Handle platformX11
if (UNIX AND NOT APPLE)
file(GLOB TORQUE_PLATFORM_X11_SOURCES "platformX11/*.cpp")
endif (UNIX AND NOT APPLE)
################# Start building libs ###################
set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING TORQUE_SHADERGEN
@ -193,6 +203,12 @@ if (TORQUE_OPENGL)
set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_OPENGL)
endif (TORQUE_OPENGL)
# Linux requires X11
if (UNIX AND NOT APPLE)
set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} "X11")
set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_PLATFORM_X11_SOURCES})
endif (UNIX AND NOT APPLE)
# Search module directories
set(TORQUE_MODULE_PATHS "${CMAKE_SOURCE_DIR}/Tools/CMake/modules")