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

Merge pull request #686 from Azaezel/alpha40/cmakeAugs

Browse source 
modular source work
This commit is contained in:
Brian Roberts 2021-11-26 17:58:25 -06:00 • committed by GitHub
commit 3c30a905c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Tools/CMake/basics.cmake
View file

@ -104,6 +104,20 @@ macro(addPathRec dir)
addPath("${dir}" "REC")
endmacro()
###############################################################################
### Gameplay Modules Lib Check
###############################################################################
macro(subDirCmake result curdir)
file(GLOB children RELATIVE ${curdir} ${curdir}/*)
set(dirList "")
foreach(child ${children})
if(IS_DIRECTORY ${curdir}/${child})
LIST(APPEND dirList ${curdir}/${child})
endif()
endforeach()
set(${result} ${dirList})
endmacro()
###############################################################################
### Definition Handling
###############################################################################

20
Tools/CMake/torque3d.cmake
View file

@ -80,7 +80,7 @@ if(WIN32)
set(ALSOFT_INSTALL_HRTF_DATA OFF CACHE BOOL "Install HRTF definition files" FORCE)
set(ALSOFT_INSTALL_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "Embed the HRTF data (increases library footprint)" FORCE)
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
endif()
@ -241,7 +241,7 @@ if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
# warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
if(TORQUE_SFX_DirectX)
if(TORQUE_SFX_DirectX)
if( TORQUE_CPU_X64 )
link_directories($ENV{DXSDK_DIR}/Lib/x64)
else()
@ -384,10 +384,20 @@ addPathRec("${projectSrcDir}")
# Load module-based files
if(EXISTS ${TORQUE_APP_DIR}/game/data)
message("Reading modules in ${TORQUE_APP_DIR}/game/data path...")
addInclude("${TORQUE_APP_DIR}/game/data")
addPathRec("${TORQUE_APP_DIR}/game/data")
subDirCmake(MODULEDIRS ${TORQUE_APP_DIR}/game/data)
foreach(modDir ${MODULEDIRS})
addInclude("${modDir}/source")
addPathRec("${modDir}/source")
file(GLOB modules "${modDir}/lib/*.cmake")
foreach(module ${modules})
set(moduleLibDir "${modDir}/lib")
include(${module})
endforeach()
endforeach()
endif()
if(EXISTS ${TORQUE_APP_DIR}/game/tools)
message("Reading modules in ${TORQUE_APP_DIR}/game/tools path...")