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

Merge pull request #1567 from JeffProgrammer/epoxy

Browse source 
Added Epoxy in favor of GLEW
This commit is contained in:
Areloch 2016-05-05 19:40:59 -05:00
commit e8bc70e514
851 changed files with 162429 additions and 73286 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Tools/CMake/libraries/epoxy.cmake Normal file
View file

@ -0,0 +1,43 @@
# -----------------------------------------------------------------------------
# Copyright (c) 2016 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.
# -----------------------------------------------------------------------------
project(epoxy)
addPath("${libDir}/epoxy/src")
# TODO EGL support if we ever use EGL instead of GLX
if (WIN32)
addPath("${libDir}/epoxy/src/wgl")
addDef(BUILD_WGL)
else()
addPath("${libDir}/epoxy/src/glx")
addDef(BUILD_GLX)
endif()
addInclude("${libDir}/epoxy/include")
addInclude("${libDir}/epoxy/src")
finishLibrary()
# VS 2015 has a problem with sdl and epoxy together and requires optimizations to be disabled
if (MSVC14)
target_compile_options(epoxy PRIVATE "/Od")
endif()

18
Tools/CMake/torque3d.cmake
View file

@ -509,12 +509,9 @@ if( TORQUE_OPENGL )
if( TORQUE_OPENGL AND NOT TORQUE_DEDICATED )
addPath("${srcDir}/gfx/gl")
addPath("${srcDir}/gfx/gl/tGL")
addPath("${srcDir}/shaderGen/GLSL")
addPath("${srcDir}/shaderGen/GLSL")
addPath("${srcDir}/terrain/glsl")
addPath("${srcDir}/forest/glsl")
# glew
LIST(APPEND ${PROJECT_NAME}_files "${libDir}/glew/src/glew.c")
endif()
if(WIN32 AND NOT TORQUE_SDL)
@ -567,6 +564,9 @@ addLib(squish)
addLib(collada)
addLib(pcre)
addLib(convexDecomp)
if (TORQUE_OPENGL)
addLib(epoxy)
endif()
if(WIN32)
# copy pasted from T3D build system, some might not be needed
@ -633,9 +633,6 @@ endif()
if(TORQUE_OPENGL)
addDef(TORQUE_OPENGL)
if(WIN32)
addDef(GLEW_STATIC)
endif()
endif()
if(TORQUE_SDL)
@ -670,7 +667,8 @@ if(TORQUE_SDL)
addInclude("${libDir}/nativeFileDialogs/include")
endif()
if(TORQUE_OPENGL)
addInclude("${libDir}/glew/include")
addInclude("${libDir}/epoxy/include")
addInclude("${libDir}/epoxy/src")
endif()
if(UNIX)
@ -678,10 +676,6 @@ if(UNIX)
addInclude("/usr/include/freetype2")
endif()
if(TORQUE_OPENGL)
addInclude("${libDir}/glew/include")
endif()
# external things
if(WIN32)
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)