mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-06 22:10:36 +00:00
Merge branch 'GarageGames/master' into ueberengine-dev
Conflicts: Engine/source/windowManager/sdl/sdlWindowMgr.cpp Tools/CMake/torque3d.cmake 3.10 final update
This commit is contained in:
Duion
commit
aff033dd0d
1003 changed files with 53039 additions and 82707 deletions
|
|
@ -165,11 +165,52 @@ macro(addLib libs)
|
|||
endforeach()
|
||||
endmacro()
|
||||
|
||||
#addLibRelease will add to only release builds
|
||||
macro(addLibRelease libs)
|
||||
foreach(lib ${libs})
|
||||
# check if we can build it ourselfs
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake")
|
||||
addLibSrc("${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake")
|
||||
endif()
|
||||
# then link against it
|
||||
# two possibilities: a) target already known, so add it directly, or b) target not yet known, so add it to its cache
|
||||
if(TARGET ${PROJECT_NAME})
|
||||
target_link_libraries(${PROJECT_NAME} optimized "${lib}")
|
||||
else()
|
||||
list(APPEND ${PROJECT_NAME}_libsRelease ${lib})
|
||||
endif()
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
#addLibDebug will add to only debug builds
|
||||
macro(addLibDebug libs)
|
||||
foreach(lib ${libs})
|
||||
# check if we can build it ourselfs
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake")
|
||||
addLibSrc("${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake")
|
||||
endif()
|
||||
# then link against it
|
||||
# two possibilities: a) target already known, so add it directly, or b) target not yet known, so add it to its cache
|
||||
if(TARGET ${PROJECT_NAME})
|
||||
target_link_libraries(${PROJECT_NAME} debug "${lib}")
|
||||
else()
|
||||
list(APPEND ${PROJECT_NAME}_libsDebug ${lib})
|
||||
endif()
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
# this applies cached definitions onto the target
|
||||
macro(_process_libs)
|
||||
if(DEFINED ${PROJECT_NAME}_libs)
|
||||
target_link_libraries(${PROJECT_NAME} "${${PROJECT_NAME}_libs}")
|
||||
endif()
|
||||
if(DEFINED ${PROJECT_NAME}_libsRelease)
|
||||
target_link_libraries(${PROJECT_NAME} optimized "${${PROJECT_NAME}_libsRelease}")
|
||||
endif()
|
||||
if(DEFINED ${PROJECT_NAME}_libsDebug)
|
||||
target_link_libraries(${PROJECT_NAME} debug "${${PROJECT_NAME}_libsDebug}")
|
||||
endif()
|
||||
|
||||
endmacro()
|
||||
|
||||
# apple frameworks
|
||||
|
|
|
|||
|
|
@ -36,14 +36,6 @@ addPath( "${libDir}/bullet/src/BulletDynamics/Dynamics" )
|
|||
addPath( "${libDir}/bullet/src/BulletDynamics/Vehicle" )
|
||||
addPath( "${libDir}/bullet/src/LinearMath" )
|
||||
|
||||
if( WIN32 )
|
||||
addDef( "WIN32" )
|
||||
|
||||
addPath( "${libDir}/bullet/src/BulletMultiThreaded" )
|
||||
addPath( "${libDir}/bullet/src/MiniCL/MiniCLTask" )
|
||||
addPath( "${libDir}/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask" )
|
||||
addInclude( "${libDir}/bullet/src/vectormath/scalar" )
|
||||
endif()
|
||||
|
||||
addInclude( "${libDir}/bullet/src" )
|
||||
|
||||
|
|
|
|||
161
Tools/CMake/modules/module_physx3.cmake
Normal file
161
Tools/CMake/modules/module_physx3.cmake
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 GarageGames, LLC
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to
|
||||
# deal in the Software without restriction, including without limitation the
|
||||
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
# sell copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
# IN THE SOFTWARE.
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# module Physx 3.3
|
||||
|
||||
option(TORQUE_PHYSICS_PHYSX3 "Use PhysX 3.3 physics" OFF)
|
||||
|
||||
if( NOT TORQUE_PHYSICS_PHYSX3 )
|
||||
return()
|
||||
endif()
|
||||
|
||||
if("${PHYSX3_BASE_PATH}" STREQUAL "")
|
||||
set(PHYSX3_BASE_PATH "" CACHE PATH "PhysX 3.3 path" FORCE)
|
||||
endif()
|
||||
|
||||
#still no path we can't go any further
|
||||
if("${PHYSX3_BASE_PATH}" STREQUAL "")
|
||||
message(FATAL_ERROR "No PhysX path selected")
|
||||
return()
|
||||
endif()
|
||||
|
||||
#set physx path
|
||||
set(PHYSX3_PATH "${PHYSX3_BASE_PATH}/PhysXSDK")
|
||||
|
||||
# TODO linux support
|
||||
if(MSVC)
|
||||
if(TORQUE_CPU_X32)
|
||||
if(MSVC11)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc11win32)
|
||||
elseif(MSVC12)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc12win32)
|
||||
elseif(MSVC14)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc14win32)
|
||||
else()
|
||||
return()
|
||||
endif()
|
||||
set(PHYSX3_LIBNAME_POSTFIX _x86)
|
||||
|
||||
elseif(TORQUE_CPU_X64)
|
||||
if(MSVC11)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc11win64)
|
||||
elseif(MSVC12)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc12win64)
|
||||
elseif(MSVC14)
|
||||
set(PHYSX3_LIBPATH_PREFIX vc14win64)
|
||||
else()
|
||||
return()
|
||||
endif()
|
||||
set(PHYSX3_LIBNAME_POSTFIX _x64)
|
||||
|
||||
endif()
|
||||
|
||||
endif(MSVC)
|
||||
|
||||
MACRO(FIND_PHYSX3_LIBRARY VARNAME LIBNAME WITHPOSTFIX)
|
||||
|
||||
set(LIBPOSTFIX "")
|
||||
if(${WITHPOSTFIX})
|
||||
set(LIBPOSTFIX ${PHYSX3_LIBNAME_POSTFIX})
|
||||
endif(${WITHPOSTFIX})
|
||||
find_library(PHYSX3_${VARNAME}_LIBRARY NAMES ${LIBNAME}${LIBPOSTFIX}
|
||||
PATHS ${PHYSX3_PATH}/Lib/${PHYSX3_LIBPATH_PREFIX})
|
||||
find_library(PHYSX3_${VARNAME}_LIBRARY_DEBUG NAMES ${LIBNAME}DEBUG${LIBPOSTFIX}
|
||||
PATHS ${PHYSX3_PATH}/Lib/${PHYSX3_LIBPATH_PREFIX})
|
||||
|
||||
ENDMACRO(FIND_PHYSX3_LIBRARY VARNAME LIBNAME)
|
||||
|
||||
# Find the Libs, we just use the full path to save playing around with link_directories
|
||||
FIND_PHYSX3_LIBRARY(CORE PhysX3 1)
|
||||
FIND_PHYSX3_LIBRARY(COMMON PhysX3Common 1)
|
||||
FIND_PHYSX3_LIBRARY(COOKING PhysX3Cooking 1)
|
||||
FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 1)
|
||||
FIND_PHYSX3_LIBRARY(EXTENSIONS PhysX3Extensions 0)
|
||||
FIND_PHYSX3_LIBRARY(TASK PxTask 0)
|
||||
FIND_PHYSX3_LIBRARY(DEBUGGER PhysXVisualDebuggerSDK 0)
|
||||
FIND_PHYSX3_LIBRARY(PROFILE PhysXProfileSDK 0)
|
||||
|
||||
if(NOT PHYSX3_CORE_LIBRARY)
|
||||
return()
|
||||
endif()
|
||||
|
||||
# Defines
|
||||
addDef( "TORQUE_PHYSICS_PHYSX3" )
|
||||
addDef( "TORQUE_PHYSICS_ENABLED" )
|
||||
|
||||
# Source
|
||||
addPath( "${srcDir}/T3D/physics/physx3" )
|
||||
|
||||
# Includes
|
||||
addInclude( "${PHYSX3_PATH}/Include" )
|
||||
addInclude( "${PHYSX3_PATH}/Include/extensions" )
|
||||
addInclude( "${PHYSX3_PATH}/Include/foundation" )
|
||||
addInclude( "${PHYSX3_PATH}/Include/characterkinematic" )
|
||||
addInclude( "${PHYSX3_PATH}/Include/common" )
|
||||
|
||||
#Add the libs
|
||||
set(PHYSX_LIBRARIES_DEBUG
|
||||
${PHYSX3_CORE_LIBRARY_DEBUG}
|
||||
${PHYSX3_COMMON_LIBRARY_DEBUG}
|
||||
${PHYSX3_COOKING_LIBRARY_DEBUG}
|
||||
${PHYSX3_CHARACTER_LIBRARY_DEBUG}
|
||||
${PHYSX3_EXTENSIONS_LIBRARY_DEBUG}
|
||||
${PHYSX3_TASK_LIBRARY_DEBUG}
|
||||
${PHYSX3_DEBUGGER_LIBRARY_DEBUG}
|
||||
${PHYSX3_PROFILE_LIBRARY_DEBUG}
|
||||
)
|
||||
|
||||
set(PHYSX_LIBRARIES
|
||||
${PHYSX3_CORE_LIBRARY}
|
||||
${PHYSX3_COMMON_LIBRARY}
|
||||
${PHYSX3_COOKING_LIBRARY}
|
||||
${PHYSX3_CHARACTER_LIBRARY}
|
||||
${PHYSX3_EXTENSIONS_LIBRARY}
|
||||
${PHYSX3_TASK_LIBRARY}
|
||||
${PHYSX3_DEBUGGER_LIBRARY}
|
||||
${PHYSX3_PROFILE_LIBRARY}
|
||||
)
|
||||
|
||||
addLibRelease("${PHYSX_LIBRARIES}")
|
||||
addLibDebug("${PHYSX_LIBRARIES_DEBUG}")
|
||||
|
||||
#Install dll files
|
||||
if( WIN32 )
|
||||
# File Copy for Release
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CharacterKinematic${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3Common${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3Cooking${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release")
|
||||
|
||||
# File Copy for Debug
|
||||
if(TORQUE_CPU_X32)
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/nvToolsExt32_1.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
elseif(TORQUE_CPU_X64)
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/nvToolsExt64_1.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
endif()
|
||||
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3DEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CharacterKinematicDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CommonDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CookingDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug")
|
||||
|
||||
endif(WIN32)
|
||||
|
|
@ -67,48 +67,92 @@ endif()
|
|||
option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
|
||||
#windows uses openal-soft
|
||||
if(WIN32)
|
||||
#disable a few things that are not required
|
||||
set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE)
|
||||
set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE)
|
||||
set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE)
|
||||
set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE)
|
||||
set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE)
|
||||
set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE)
|
||||
set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE)
|
||||
set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
|
||||
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
|
||||
#disable a few things that are not required
|
||||
set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE)
|
||||
set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE)
|
||||
set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE)
|
||||
set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE)
|
||||
set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE)
|
||||
set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE)
|
||||
set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE)
|
||||
set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
|
||||
|
||||
add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
|
||||
endif()
|
||||
|
||||
if(TORQUE_SFX_OPENAL)
|
||||
#Hide some unnecessary fields as advanced
|
||||
mark_as_advanced(ALSOFT_AMBDEC_PRESETS)
|
||||
mark_as_advanced(ALSOFT_BACKEND_DSOUND)
|
||||
mark_as_advanced(ALSOFT_BACKEND_MMDEVAPI)
|
||||
mark_as_advanced(ALSOFT_BACKEND_WAVE)
|
||||
mark_as_advanced(ALSOFT_BACKEND_WINMM)
|
||||
mark_as_advanced(ALSOFT_CONFIG)
|
||||
mark_as_advanced(ALSOFT_CPUEXT_SSE)
|
||||
mark_as_advanced(ALSOFT_CPUEXT_SSE2)
|
||||
mark_as_advanced(ALSOFT_CPUEXT_SSE3)
|
||||
mark_as_advanced(ALSOFT_CPUEXT_SSE4_1)
|
||||
mark_as_advanced(ALSOFT_DLOPEN)
|
||||
mark_as_advanced(ALSOFT_EMBED_HRTF_DATA)
|
||||
mark_as_advanced(ALSOFT_EXAMPLES)
|
||||
mark_as_advanced(ALSOFT_HRTF_DEFS)
|
||||
mark_as_advanced(ALSOFT_INSTALL)
|
||||
mark_as_advanced(ALSOFT_NO_CONFIG_UTIL)
|
||||
mark_as_advanced(ALSOFT_NO_UID_DEFS)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_ALSA)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_COREAUDIO)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_DSOUND)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_JACK)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_MMDEVAPI)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_NEON)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_OPENSL)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_OSS)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_PORTAUDIO)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_PULSEAUDIO)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_QSA)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_SNDIO)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_SOLARIS)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_SSE)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_SSE2)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_SSE4_1)
|
||||
mark_as_advanced(ALSOFT_REQUIRE_WINMM)
|
||||
mark_as_advanced(ALSOFT_TESTS)
|
||||
mark_as_advanced(ALSOFT_UTILS)
|
||||
mark_as_advanced(ALSOFT_WERROR)
|
||||
mark_as_advanced(COREAUDIO_FRAMEWORK)
|
||||
mark_as_advanced(CMAKE_DEBUG_POSTFIX)
|
||||
mark_as_advanced(FORCE_STATIC_VCRT)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(TORQUE_SFX_OPENAL)
|
||||
option(TORQUE_HIFI "HIFI? support" OFF)
|
||||
mark_as_advanced(TORQUE_HIFI)
|
||||
option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
|
||||
mark_as_advanced(TORQUE_EXTENDED_MOVE)
|
||||
|
||||
if(WIN32)
|
||||
option(TORQUE_SDL "Use SDL for window and input" OFF)
|
||||
option(TORQUE_SDL "Use SDL for window and input" ON)
|
||||
else()
|
||||
set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
option(TORQUE_OPENGL "Allow OpenGL render" OFF)
|
||||
option(TORQUE_OPENGL "Allow OpenGL render" ON)
|
||||
#mark_as_advanced(TORQUE_OPENGL)
|
||||
else()
|
||||
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
option(TORQUE_OPENGL "Allow OpenGL render" OFF)
|
||||
#mark_as_advanced(TORQUE_OPENGL)
|
||||
else()
|
||||
set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF)
|
||||
option(TORQUE_D3D11 "Allow Direct3D 11 render" ON)
|
||||
endif()
|
||||
|
||||
option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF)
|
||||
mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
|
||||
|
||||
option(TORQUE_DEDICATED "Torque dedicated" OFF)
|
||||
mark_as_advanced(TORQUE_DEDICATED)
|
||||
|
||||
###############################################################################
|
||||
# options
|
||||
###############################################################################
|
||||
|
|
@ -587,7 +631,7 @@ endif()
|
|||
if(NOT EXISTS "${projectOutDir}/${PROJECT_NAME}.torsion")
|
||||
CONFIGURE_FILE("${cmakeDir}/template.torsion.in" "${projectOutDir}/${PROJECT_NAME}.torsion")
|
||||
endif()
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in" AND NOT EXISTS "${projectOutDir}/main.cs")
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in")
|
||||
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in" "${projectOutDir}/main.cs")
|
||||
endif()
|
||||
if(WIN32)
|
||||
|
|
@ -649,6 +693,7 @@ if (APPLE)
|
|||
addFramework("CoreVideo")
|
||||
#grrr damn you sdl!
|
||||
addFramework("Carbon")
|
||||
addFramework("AudioToolbox")
|
||||
addLib("iconv")
|
||||
#set a few arch defaults
|
||||
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "OSX Architecture" FORCE)
|
||||
|
|
@ -699,6 +744,63 @@ if(TORQUE_SDL)
|
|||
addDef(TORQUE_SDL)
|
||||
addInclude(${libDir}/sdl/include)
|
||||
addLib(SDL2)
|
||||
|
||||
SET(VIDEO_WAYLAND OFF CACHE BOOL "" FORCE)
|
||||
mark_as_advanced(3DNOW)
|
||||
mark_as_advanced(ALSA)
|
||||
mark_as_advanced(ALTIVEC)
|
||||
mark_as_advanced(ARTS)
|
||||
mark_as_advanced(ASSEMBLY)
|
||||
mark_as_advanced(ASSERTIONS)
|
||||
mark_as_advanced(DIRECTX)
|
||||
mark_as_advanced(DISKAUDIO)
|
||||
mark_as_advanced(DUMMYAUDIO)
|
||||
mark_as_advanced(ESD)
|
||||
mark_as_advanced(FUSIONSOUND)
|
||||
mark_as_advanced(INPUT_TSLIB)
|
||||
mark_as_advanced(LIBC)
|
||||
mark_as_advanced(MMX)
|
||||
mark_as_advanced(NAS)
|
||||
mark_as_advanced(NAS_SHARED)
|
||||
mark_as_advanced(OSS)
|
||||
mark_as_advanced(PTHREADS)
|
||||
mark_as_advanced(PULSEAUDIO)
|
||||
mark_as_advanced(RENDER_D3D)
|
||||
mark_as_advanced(RPATH)
|
||||
mark_as_advanced(SNDIO)
|
||||
mark_as_advanced(SSE)
|
||||
mark_as_advanced(SSE2)
|
||||
mark_as_advanced(SSEMATH)
|
||||
mark_as_advanced(WINDRES)
|
||||
mark_as_advanced(SDL_ATOMIC)
|
||||
mark_as_advanced(SDL_AUDIO)
|
||||
mark_as_advanced(SDL_CPUINFO)
|
||||
mark_as_advanced(SDL_DLOPEN)
|
||||
mark_as_advanced(SDL_EVENTS)
|
||||
mark_as_advanced(SDL_FILE)
|
||||
mark_as_advanced(SDL_FILESYSTEM)
|
||||
mark_as_advanced(SDL_HAPTIC)
|
||||
mark_as_advanced(SDL_JOYSTICK)
|
||||
mark_as_advanced(SDL_LOADSO)
|
||||
mark_as_advanced(SDL_POWER)
|
||||
mark_as_advanced(SDL_RENDER)
|
||||
mark_as_advanced(SDL_SHARED)
|
||||
mark_as_advanced(SDL_STATIC)
|
||||
mark_as_advanced(SDL_THREADS)
|
||||
mark_as_advanced(SDL_TIMERS)
|
||||
mark_as_advanced(SDL_VIDEO)
|
||||
mark_as_advanced(CLOCK_GETTIME)
|
||||
mark_as_advanced(GCC_ATOMICS)
|
||||
mark_as_advanced(VIDEO_WAYLAND)
|
||||
mark_as_advanced(VIDEO_COCOA)
|
||||
mark_as_advanced(VIDEO_DIRECTFB)
|
||||
mark_as_advanced(VIDEO_DUMMY)
|
||||
mark_as_advanced(VIDEO_MIR)
|
||||
mark_as_advanced(VIDEO_OPENGL)
|
||||
mark_as_advanced(VIDEO_OPENGLES)
|
||||
mark_as_advanced(VIDEO_RPI)
|
||||
mark_as_advanced(VIDEO_VIVANTE)
|
||||
mark_as_advanced(VIDEO_X11)
|
||||
endif()
|
||||
|
||||
if(TORQUE_STATIC_CODE_ANALYSIS)
|
||||
|
|
@ -751,6 +853,12 @@ if(MSVC)
|
|||
endforeach()
|
||||
endif()
|
||||
|
||||
###############################################################################
|
||||
# Project-specific configuration:
|
||||
###############################################################################
|
||||
|
||||
include(${TORQUE_APP_DIR}/${PROJECT_NAME}.cmake OPTIONAL)
|
||||
|
||||
###############################################################################
|
||||
# Installation
|
||||
###############################################################################
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue