mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-21 12:25:30 +00:00
Fix merge conflict and add check for unix and not apple for glx
Merge branch 'development-gg' into gladdev # Conflicts: # Tools/CMake/libraries/glad.cmake
This commit is contained in:
Jeff Hutchinson
commit
0296e6d3fd
728 changed files with 83679 additions and 66879 deletions
20
Tools/CMake/Info.plist.in
Normal file
20
Tools/CMake/Info.plist.in
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>torque</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.torque3d.${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -64,11 +64,16 @@ macro(addPath dir)
|
|||
if(${ARGC} GREATER 1 AND "${ARGV1}" STREQUAL "REC")
|
||||
set(glob_config GLOB_RECURSE)
|
||||
endif()
|
||||
set(mac_files "")
|
||||
if(APPLE)
|
||||
set(mac_files ${dir}/*.mm ${dir}/*.m)
|
||||
endif()
|
||||
file(${glob_config} tmp_files
|
||||
${dir}/*.cpp
|
||||
${dir}/*.c
|
||||
${dir}/*.cc
|
||||
${dir}/*.h
|
||||
${mac_files}
|
||||
#${dir}/*.asm
|
||||
)
|
||||
foreach(entry ${BLACKLIST})
|
||||
|
|
@ -167,6 +172,13 @@ macro(_process_libs)
|
|||
endif()
|
||||
endmacro()
|
||||
|
||||
# apple frameworks
|
||||
macro(addFramework framework)
|
||||
if (APPLE)
|
||||
addLib("-framework ${framework}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
###############################################################################
|
||||
### Include Handling
|
||||
###############################################################################
|
||||
|
|
@ -298,7 +310,13 @@ macro(finishExecutable)
|
|||
set_source_files_properties(${${PROJECT_NAME}_files} PROPERTIES COMPILE_FLAGS "${TORQUE_CXX_FLAGS_EXECUTABLES}")
|
||||
endif()
|
||||
|
||||
add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
|
||||
if (APPLE)
|
||||
set(ICON_FILE "${projectSrcDir}/torque.icns")
|
||||
set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
|
||||
add_executable("${PROJECT_NAME}" MACOSX_BUNDLE ${ICON_FILE} ${${PROJECT_NAME}_files})
|
||||
else()
|
||||
add_executable("${PROJECT_NAME}" WIN32 ${${PROJECT_NAME}_files})
|
||||
endif()
|
||||
addInclude("${firstDir}")
|
||||
|
||||
_postTargetProcess()
|
||||
|
|
@ -352,7 +370,7 @@ if(WIN32)
|
|||
set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} /arch:SSE2")
|
||||
endif()
|
||||
set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE TYPE STRING)
|
||||
|
||||
|
||||
mark_as_advanced(TORQUE_CXX_FLAGS_COMMON)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORQUE_CXX_FLAGS_COMMON}")
|
||||
|
|
@ -387,13 +405,20 @@ else()
|
|||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
if(UNIX AND NOT APPLE)
|
||||
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${projectOutDir}")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${projectOutDir}")
|
||||
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${projectOutDir}")
|
||||
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${projectOutDir}")
|
||||
endif()
|
||||
|
||||
# fix the debug/release subfolders on windows
|
||||
if(MSVC)
|
||||
SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY" "${projectOutDir}")
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ addPath("${libDir}/glad/src")
|
|||
# TODO EGL support if we ever use EGL instead of GLX
|
||||
if (WIN32)
|
||||
addPath("${libDir}/glad/src/wgl")
|
||||
else()
|
||||
elseif (UNIX AND NOT APPLE)
|
||||
addPath("${libDir}/glad/src/glx")
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,21 @@
|
|||
|
||||
project(libogg)
|
||||
|
||||
include(CheckIncludeFiles)
|
||||
|
||||
# Configure config_type.h
|
||||
check_include_files(inttypes.h INCLUDE_INTTYPES_H)
|
||||
check_include_files(stdint.h INCLUDE_STDINT_H)
|
||||
check_include_files(sys/types.h INCLUDE_SYS_TYPES_H)
|
||||
|
||||
set(SIZE16 int16_t)
|
||||
set(USIZE16 uint16_t)
|
||||
set(SIZE32 int32_t)
|
||||
set(USIZE32 uint32_t)
|
||||
set(SIZE64 int64_t)
|
||||
|
||||
configure_file(${libDir}/libogg/include/ogg/config_types.h.in ${libDir}/libogg/include/ogg/config_types.h @ONLY)
|
||||
|
||||
addPath("${libDir}/libogg" REC)
|
||||
|
||||
addInclude(${libDir}/libogg/include)
|
||||
|
|
|
|||
32
Tools/CMake/modules/module_openvr.cmake
Normal file
32
Tools/CMake/modules/module_openvr.cmake
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
|
||||
# module openvr
|
||||
|
||||
option(TORQUE_OPENVR "Enable openvr module" OFF)
|
||||
mark_as_advanced(TORQUE_OPENVR)
|
||||
if(TORQUE_OPENVR)
|
||||
if(TORQUE_OPENVR_SDK_PATH STREQUAL "")
|
||||
set(TORQUE_OPENVR_SDK_PATH "" CACHE PATH "openvr library path" FORCE)
|
||||
endif()
|
||||
else() # hide variable
|
||||
set(TORQUE_OPENVR_SDK_PATH "" CACHE INTERNAL "" FORCE)
|
||||
endif()
|
||||
|
||||
if(TORQUE_OPENVR)
|
||||
# Source
|
||||
addPathRec( "${srcDir}/platform/input/openvr" )
|
||||
|
||||
# Includes
|
||||
addInclude( "${TORQUE_OPENVR_SDK_PATH}/headers" )
|
||||
|
||||
# Libs
|
||||
if( WIN32 )
|
||||
if( TORQUE_CPU_X64 )
|
||||
link_directories( "${TORQUE_OPENVR_SDK_PATH}/lib/win64" )
|
||||
else()
|
||||
link_directories( "${TORQUE_OPENVR_SDK_PATH}/lib/win32" )
|
||||
endif()
|
||||
addLib( "openvr_api" )
|
||||
endif()
|
||||
|
||||
addDef(TORQUE_OPENVR)
|
||||
endif()
|
||||
BIN
Tools/CMake/torque.icns
Normal file
BIN
Tools/CMake/torque.icns
Normal file
Binary file not shown.
|
|
@ -27,15 +27,21 @@ if(UNIX)
|
|||
set(CXX_FLAG32 "")
|
||||
endif()
|
||||
#set(CXX_FLAG32 "-m32") #uncomment for build x32 on OSx64
|
||||
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors -Wno-return-type-c-linkage -Wno-unused-local-typedef ${TORQUE_ADDITIONAL_LINKER_FLAGS}")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors -Wno-return-type-c-linkage -Wno-unused-local-typedef ${TORQUE_ADDITIONAL_LINKER_FLAGS}")
|
||||
else()
|
||||
# default compiler flags
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CXX_FLAG32} -Wundef -msse -pipe -Wfatal-errors ${TORQUE_ADDITIONAL_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN'")
|
||||
|
||||
endif()
|
||||
|
||||
# for asm files
|
||||
SET (CMAKE_ASM_NASM_OBJECT_FORMAT "elf")
|
||||
ENABLE_LANGUAGE (ASM_NASM)
|
||||
|
||||
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
endif()
|
||||
|
||||
|
|
@ -59,6 +65,19 @@ else()
|
|||
set(TORQUE_SFX_DirectX OFF)
|
||||
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)
|
||||
endif()
|
||||
mark_as_advanced(TORQUE_SFX_OPENAL)
|
||||
option(TORQUE_HIFI "HIFI? support" OFF)
|
||||
mark_as_advanced(TORQUE_HIFI)
|
||||
|
|
@ -94,10 +113,10 @@ mark_as_advanced(TORQUE_EXPERIMENTAL_EC)
|
|||
###############################################################################
|
||||
# options
|
||||
###############################################################################
|
||||
if(NOT MSVC) # handle single-configuration generator
|
||||
if(NOT MSVC AND NOT APPLE) # handle single-configuration generator
|
||||
set(TORQUE_BUILD_TYPE "Debug" CACHE STRING "Select one of Debug, Release and RelWithDebInfo")
|
||||
set_property(CACHE TORQUE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")
|
||||
|
||||
|
||||
set(TORQUE_ADDITIONAL_LINKER_FLAGS "" CACHE STRING "Additional linker flags")
|
||||
mark_as_advanced(TORQUE_ADDITIONAL_LINKER_FLAGS)
|
||||
endif()
|
||||
|
|
@ -157,7 +176,7 @@ if(WIN32)
|
|||
endif()
|
||||
|
||||
# build types
|
||||
if(NOT MSVC) # handle single-configuration generator
|
||||
if(NOT MSVC AND NOT APPLE) # handle single-configuration generator
|
||||
set(CMAKE_BUILD_TYPE ${TORQUE_BUILD_TYPE})
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(TORQUE_DEBUG TRUE)
|
||||
|
|
@ -200,7 +219,7 @@ addPath("${srcDir}/math/util")
|
|||
addPath("${srcDir}/math/test")
|
||||
|
||||
addPath("${srcDir}/platform")
|
||||
if(NOT TORQUE_SDL)
|
||||
if(NOT TORQUE_SDL)
|
||||
set(BLACKLIST "fileDialog.cpp" )
|
||||
endif()
|
||||
addPath("${srcDir}/platform/nativeDialogs")
|
||||
|
|
@ -258,7 +277,7 @@ addPath("${srcDir}/physics")
|
|||
addPath("${srcDir}/gui/3d")
|
||||
addPath("${srcDir}/postFx")
|
||||
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
set(BLACKLIST "entity.cpp;entity.h" )
|
||||
endif()
|
||||
addPath("${srcDir}/T3D")
|
||||
|
|
@ -324,15 +343,17 @@ endif()
|
|||
# OpenAL
|
||||
if(TORQUE_SFX_OPENAL AND NOT TORQUE_DEDICATED)
|
||||
addPath("${srcDir}/sfx/openal")
|
||||
#addPath("${srcDir}/sfx/openal/mac")
|
||||
if(WIN32)
|
||||
addPath("${srcDir}/sfx/openal/win32")
|
||||
addInclude("${libDir}/openal/win32")
|
||||
addPath("${srcDir}/sfx/openal/win32")
|
||||
addInclude("${libDir}/openal-soft/include")
|
||||
endif()
|
||||
if(UNIX AND NOT APPLE)
|
||||
addPath("${srcDir}/sfx/openal/linux")
|
||||
endif()
|
||||
if(APPLE)
|
||||
addPath("${srcDir}/sfx/openal/mac")
|
||||
addFramework("OpenAL")
|
||||
endif()
|
||||
if(UNIX)
|
||||
addPath("${srcDir}/sfx/openal/linux")
|
||||
endif()
|
||||
|
||||
endif()
|
||||
|
||||
# Vorbis
|
||||
|
|
@ -348,7 +369,7 @@ if(TORQUE_THEORA)
|
|||
addPath("${srcDir}/core/ogg")
|
||||
addPath("${srcDir}/gfx/video")
|
||||
addPath("${srcDir}/gui/theora")
|
||||
|
||||
|
||||
addDef(TORQUE_OGGTHEORA)
|
||||
addDef(TORQUE_OGGVORIBS)
|
||||
addInclude(${libDir}/libtheora/include)
|
||||
|
|
@ -361,7 +382,7 @@ if(TORQUE_TOOLS)
|
|||
addPath("${srcDir}/environment/editors")
|
||||
addPath("${srcDir}/forest/editor")
|
||||
addPath("${srcDir}/gui/editor")
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
if(NOT TORQUE_EXPERIMENTAL_EC)
|
||||
set(BLACKLIST "entityGroup.cpp;entityGroup.h;mountingGroup.cpp;mountingGroup.h;componentGroup.cpp;componentGroup.h" )
|
||||
endif()
|
||||
addPath("${srcDir}/gui/editor/inspector")
|
||||
|
|
@ -372,7 +393,7 @@ if(TORQUE_HIFI)
|
|||
addPath("${srcDir}/T3D/gameBase/hifi")
|
||||
addDef(TORQUE_HIFI_NET)
|
||||
endif()
|
||||
|
||||
|
||||
if(TORQUE_EXTENDED_MOVE)
|
||||
addPath("${srcDir}/T3D/gameBase/extended")
|
||||
addDef(TORQUE_EXTENDED_MOVE)
|
||||
|
|
@ -383,12 +404,12 @@ endif()
|
|||
if(TORQUE_SDL)
|
||||
addPathRec("${srcDir}/windowManager/sdl")
|
||||
addPathRec("${srcDir}/platformSDL")
|
||||
|
||||
|
||||
if(TORQUE_OPENGL)
|
||||
addPathRec("${srcDir}/gfx/gl/sdl")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
#set(CMAKE_SIZEOF_VOID_P 4) #force 32 bit
|
||||
set(ENV{CFLAGS} "${CXX_FLAG32} -g -O3")
|
||||
if("${TORQUE_ADDITIONAL_LINKER_FLAGS}" STREQUAL "")
|
||||
|
|
@ -408,22 +429,33 @@ if(TORQUE_SDL)
|
|||
# Add other flags to the compiler
|
||||
add_definitions(${GTK3_CFLAGS_OTHER})
|
||||
|
||||
set(BLACKLIST "nfd_win.cpp" )
|
||||
set(BLACKLIST "nfd_win.cpp" "nfd_cocoa.m" )
|
||||
addLib(nativeFileDialogs)
|
||||
|
||||
set(BLACKLIST "" )
|
||||
target_link_libraries(nativeFileDialogs ${GTK3_LIBRARIES})
|
||||
elseif(APPLE)
|
||||
set(BLACKLIST "nfd_gtk.c" "nfd_win.cpp" )
|
||||
addLib(nativeFileDialogs)
|
||||
set(BLACKLIST "" )
|
||||
else()
|
||||
set(BLACKLIST "nfd_gtk.c" )
|
||||
set(BLACKLIST "nfd_gtk.c" "nfd_cocoa.m" )
|
||||
addLib(nativeFileDialogs)
|
||||
set(BLACKLIST "" )
|
||||
addLib(comctl32)
|
||||
endif()
|
||||
|
||||
set(BLACKLIST "" )
|
||||
addLib(comctl32)
|
||||
endif()
|
||||
|
||||
#override and hide SDL2 cache variables
|
||||
set(SDL_SHARED ON CACHE INTERNAL "" FORCE)
|
||||
set(SDL_STATIC OFF CACHE INTERNAL "" FORCE)
|
||||
#set apple to sue sdl static lib, other platforms use dynamic
|
||||
if(APPLE)
|
||||
set(SDL_SHARED OFF CACHE BOOL "Build a shared version of the library" FORCE)
|
||||
set(SDL_STATIC ON CACHE BOOL "Build a static version of the library" FORCE)
|
||||
else()
|
||||
set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library" FORCE)
|
||||
set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library" FORCE)
|
||||
endif()
|
||||
add_subdirectory( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2)
|
||||
link_directories( ${libDir}/sdl ${CMAKE_CURRENT_BINARY_DIR}/sdl2)
|
||||
endif()
|
||||
|
||||
if(TORQUE_DEDICATED)
|
||||
|
|
@ -445,13 +477,15 @@ endforeach()
|
|||
###############################################################################
|
||||
if(WIN32)
|
||||
addPath("${srcDir}/platformWin32")
|
||||
if(TORQUE_SDL)
|
||||
if(TORQUE_SDL)
|
||||
set(BLACKLIST "fileDialog.cpp" )
|
||||
endif()
|
||||
addPath("${srcDir}/platformWin32/nativeDialogs")
|
||||
set(BLACKLIST "" )
|
||||
addPath("${srcDir}/platformWin32/menus")
|
||||
addPath("${srcDir}/platformWin32/threads")
|
||||
if(NOT TORQUE_SDL)
|
||||
addPath("${srcDir}/platformWin32/threads")
|
||||
endif()
|
||||
addPath("${srcDir}/platformWin32/videoInfo")
|
||||
addPath("${srcDir}/platformWin32/minidump")
|
||||
addPath("${srcDir}/windowManager/win32")
|
||||
|
|
@ -460,7 +494,7 @@ if(WIN32)
|
|||
endif()
|
||||
addPath("${srcDir}/gfx/D3D9")
|
||||
addPath("${srcDir}/gfx/D3D9/pc")
|
||||
addPath("${srcDir}/shaderGen/HLSL")
|
||||
addPath("${srcDir}/shaderGen/HLSL")
|
||||
addPath("${srcDir}/terrain/hlsl")
|
||||
addPath("${srcDir}/forest/hlsl")
|
||||
# add windows rc file for the icon
|
||||
|
|
@ -469,50 +503,14 @@ endif()
|
|||
|
||||
if(APPLE)
|
||||
addPath("${srcDir}/platformMac")
|
||||
addPath("${srcDir}/platformMac/menus")
|
||||
addPath("${srcDir}/platformPOSIX")
|
||||
addPath("${srcDir}/windowManager/mac")
|
||||
addPath("${srcDir}/gfx/gl")
|
||||
addPath("${srcDir}/gfx/gl/ggl")
|
||||
addPath("${srcDir}/gfx/gl/ggl/mac")
|
||||
addPath("${srcDir}/gfx/gl/ggl/generated")
|
||||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
addPath("${srcDir}/terrain/glsl")
|
||||
addPath("${srcDir}/forest/glsl")
|
||||
endif()
|
||||
|
||||
if(XBOX360)
|
||||
addPath("${srcDir}/platformXbox")
|
||||
addPath("${srcDir}/platformXbox/threads")
|
||||
addPath("${srcDir}/windowManager/360")
|
||||
addPath("${srcDir}/gfx/D3D9")
|
||||
addPath("${srcDir}/gfx/D3D9/360")
|
||||
addPath("${srcDir}/shaderGen/HLSL")
|
||||
addPath("${srcDir}/shaderGen/360")
|
||||
addPath("${srcDir}/ts/arch/360")
|
||||
addPath("${srcDir}/terrain/hlsl")
|
||||
addPath("${srcDir}/forest/hlsl")
|
||||
endif()
|
||||
|
||||
if(PS3)
|
||||
addPath("${srcDir}/platformPS3")
|
||||
addPath("${srcDir}/platformPS3/threads")
|
||||
addPath("${srcDir}/windowManager/ps3")
|
||||
addPath("${srcDir}/gfx/gl")
|
||||
addPath("${srcDir}/gfx/gl/ggl")
|
||||
addPath("${srcDir}/gfx/gl/ggl/ps3")
|
||||
addPath("${srcDir}/gfx/gl/ggl/generated")
|
||||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
addPath("${srcDir}/ts/arch/ps3")
|
||||
addPath("${srcDir}/terrain/glsl")
|
||||
addPath("${srcDir}/forest/glsl")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
if(UNIX AND NOT APPLE)
|
||||
# linux_dedicated
|
||||
if(TORQUE_DEDICATED)
|
||||
addPath("${srcDir}/windowManager/dedicated")
|
||||
# ${srcDir}/platformX86UNIX/*.client.* files are not needed
|
||||
# ${srcDir}/platformX86UNIX/*.client.* files are not needed
|
||||
# @todo: move to separate file
|
||||
file( GLOB tmp_files
|
||||
${srcDir}/platformX86UNIX/*.cpp
|
||||
|
|
@ -527,9 +525,8 @@ if(UNIX)
|
|||
else()
|
||||
addPath("${srcDir}/platformX86UNIX")
|
||||
addPath("${srcDir}/platformX86UNIX/nativeDialogs")
|
||||
endif()
|
||||
endif()
|
||||
# linux
|
||||
addPath("${srcDir}/platformX86UNIX/threads")
|
||||
addPath("${srcDir}/platformPOSIX")
|
||||
endif()
|
||||
|
||||
|
|
@ -537,12 +534,12 @@ if( TORQUE_OPENGL )
|
|||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
if( TORQUE_OPENGL AND NOT TORQUE_DEDICATED )
|
||||
addPath("${srcDir}/gfx/gl")
|
||||
addPath("${srcDir}/gfx/gl/tGL")
|
||||
addPath("${srcDir}/gfx/gl/tGL")
|
||||
addPath("${srcDir}/shaderGen/GLSL")
|
||||
addPath("${srcDir}/terrain/glsl")
|
||||
addPath("${srcDir}/forest/glsl")
|
||||
addPath("${srcDir}/forest/glsl")
|
||||
endif()
|
||||
|
||||
|
||||
if(WIN32 AND NOT TORQUE_SDL)
|
||||
addPath("${srcDir}/gfx/gl/win32")
|
||||
endif()
|
||||
|
|
@ -563,9 +560,24 @@ message(STATUS "writing ${projectSrcDir}/torqueConfig.h")
|
|||
CONFIGURE_FILE("${cmakeDir}/torqueConfig.h.in" "${projectSrcDir}/torqueConfig.h")
|
||||
|
||||
# configure the relevant files only once
|
||||
if(NOT EXISTS "${projectSrcDir}/torque.ico")
|
||||
CONFIGURE_FILE("${cmakeDir}/torque.ico" "${projectSrcDir}/torque.ico" COPYONLY)
|
||||
|
||||
if(APPLE)
|
||||
#icon
|
||||
if(NOT EXISTS "${projectSrcDir}/torque.icns")
|
||||
CONFIGURE_FILE("${cmakeDir}/torque.icns" "${projectSrcDir}/torque.icns" COPYONLY)
|
||||
endif()
|
||||
#plist
|
||||
if(NOT EXISTS "${projectSrcDir}/Info.plist")
|
||||
CONFIGURE_FILE("${cmakeDir}/Info.plist.in" "${projectSrcDir}/Info.plist" COPYONLY)
|
||||
endif()
|
||||
#target properties for mac
|
||||
set_target_properties("${PROJECT_NAME}" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${projectSrcDir}/Info.plist")
|
||||
else()
|
||||
if(NOT EXISTS "${projectSrcDir}/torque.ico")
|
||||
CONFIGURE_FILE("${cmakeDir}/torque.ico" "${projectSrcDir}/torque.ico" COPYONLY)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(NOT EXISTS "${projectOutDir}/${PROJECT_NAME}.torsion")
|
||||
CONFIGURE_FILE("${cmakeDir}/template.torsion.in" "${projectOutDir}/${PROJECT_NAME}.torsion")
|
||||
endif()
|
||||
|
|
@ -607,11 +619,11 @@ if(WIN32)
|
|||
set(TORQUE_EXTERNAL_LIBS "COMCTL32.LIB;COMDLG32.LIB;USER32.LIB;ADVAPI32.LIB;GDI32.LIB;WINMM.LIB;WSOCK32.LIB;vfw32.lib;Imm32.lib;d3d9.lib;d3dx9.lib;DxErr.lib;ole32.lib;shell32.lib;oleaut32.lib;version.lib" CACHE STRING "external libs to link against")
|
||||
mark_as_advanced(TORQUE_EXTERNAL_LIBS)
|
||||
addLib("${TORQUE_EXTERNAL_LIBS}")
|
||||
|
||||
|
||||
if(TORQUE_OPENGL)
|
||||
addLib(OpenGL32.lib)
|
||||
endif()
|
||||
|
||||
|
||||
# JTH: DXSDK is compiled with older runtime, and MSVC 2015+ is when __vsnprintf is undefined.
|
||||
# This is a workaround by linking with the older legacy library functions.
|
||||
# See this for more info: http://stackoverflow.com/a/34230122
|
||||
|
|
@ -620,20 +632,28 @@ if(WIN32)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
if (APPLE)
|
||||
addFramework("Cocoa")
|
||||
addFramework("OpenGL")
|
||||
#These are needed by sdl2 static lib
|
||||
addFramework("CoreAudio")
|
||||
addFramework("AudioUnit")
|
||||
addFramework("ForceFeedback")
|
||||
addFramework("IOKit")
|
||||
addFramework("CoreVideo")
|
||||
#grrr damn you sdl!
|
||||
addFramework("Carbon")
|
||||
addLib("iconv")
|
||||
#set a few arch defaults
|
||||
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "OSX Architecture" FORCE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "OSX Deployment target" FORCE)
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
# copy pasted from T3D build system, some might not be needed
|
||||
set(TORQUE_EXTERNAL_LIBS "dl Xxf86vm Xext X11 Xft stdc++ pthread GL" CACHE STRING "external libs to link against")
|
||||
mark_as_advanced(TORQUE_EXTERNAL_LIBS)
|
||||
|
||||
string(REPLACE " " ";" TORQUE_EXTERNAL_LIBS_LIST ${TORQUE_EXTERNAL_LIBS})
|
||||
addLib( "${TORQUE_EXTERNAL_LIBS_LIST}" )
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
# copy pasted from T3D build system, some might not be needed
|
||||
set(TORQUE_EXTERNAL_LIBS "rt dl Xxf86vm Xext X11 Xft stdc++ pthread GL" CACHE STRING "external libs to link against")
|
||||
mark_as_advanced(TORQUE_EXTERNAL_LIBS)
|
||||
|
||||
string(REPLACE " " ";" TORQUE_EXTERNAL_LIBS_LIST ${TORQUE_EXTERNAL_LIBS})
|
||||
addLib( "${TORQUE_EXTERNAL_LIBS_LIST}" )
|
||||
endif()
|
||||
|
|
@ -661,8 +681,8 @@ addDef(PCRE_STATIC)
|
|||
addDef(_CRT_SECURE_NO_WARNINGS)
|
||||
addDef(_CRT_SECURE_NO_DEPRECATE)
|
||||
|
||||
if(UNIX)
|
||||
addDef(LINUX)
|
||||
if(UNIX AND NOT APPLE)
|
||||
addDef(LINUX)
|
||||
endif()
|
||||
|
||||
if(TORQUE_OPENGL)
|
||||
|
|
@ -704,7 +724,7 @@ if(TORQUE_OPENGL)
|
|||
addInclude("${libDir}/glad/include")
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
if(UNIX AND NOT APPLE)
|
||||
addInclude("/usr/include/freetype2/freetype")
|
||||
addInclude("/usr/include/freetype2")
|
||||
endif()
|
||||
|
|
@ -714,11 +734,6 @@ if(WIN32)
|
|||
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
|
||||
endif()
|
||||
|
||||
if(UNIX)
|
||||
addInclude("/usr/include/freetype2/freetype")
|
||||
addInclude("/usr/include/freetype2")
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
# Match projectGenerator naming for executables
|
||||
set(OUTPUT_CONFIG DEBUG MINSIZEREL RELWITHDEBINFO)
|
||||
|
|
@ -737,16 +752,16 @@ endif()
|
|||
if(TORQUE_TEMPLATE)
|
||||
message("Prepare Template(${TORQUE_TEMPLATE}) install...")
|
||||
file(GLOB_RECURSE INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/*")
|
||||
|
||||
|
||||
IF( NOT TORQUE_EXPERIMENTAL_EC)
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/art/art.module.taml")
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/art/shapes/actors/Soldier/soldier.asset.taml")
|
||||
list(REMOVE_ITEM INSTALL_FILES_AND_DIRS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/scripts.module.taml")
|
||||
|
||||
|
||||
foreach(ITEM ${INSTALL_FILES_AND_DIRS})
|
||||
get_filename_component( dir ${ITEM} DIRECTORY )
|
||||
get_filename_component( fileName ${ITEM} NAME )
|
||||
if( ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components
|
||||
if( ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components/game
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/components/input
|
||||
OR ${dir} STREQUAL ${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/scripts/server/gameObjects
|
||||
|
|
@ -757,13 +772,13 @@ if(TORQUE_TEMPLATE)
|
|||
ENDIF()
|
||||
endforeach()
|
||||
ENDIF()
|
||||
|
||||
|
||||
foreach(ITEM ${INSTALL_FILES_AND_DIRS})
|
||||
get_filename_component( dir ${ITEM} DIRECTORY )
|
||||
STRING(REGEX REPLACE "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/" "${TORQUE_APP_DIR}/" INSTALL_DIR ${dir})
|
||||
install( FILES ${ITEM} DESTINATION ${INSTALL_DIR} )
|
||||
endforeach()
|
||||
|
||||
|
||||
if(WIN32)
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/cleanShaders.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeleteCachedDTSs.bat" DESTINATION "${TORQUE_APP_DIR}")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue