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

Merge pull request #5 from rextimmy/epoxy_sdl_fix

Browse source 
Fix for Epoxy to work with SDL and VS 2015
This commit is contained in:
Jeff Hutchinson 2016-05-04 09:47:52 -04:00
commit cc4d35d563
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/CMake/libraries/epoxy.cmake
View file

@ -30,10 +30,14 @@ if (WIN32)
addDef(BUILD_WGL) addDef(BUILD_WGL)
else() else()
addPath("${libDir}/epoxy/src/glx") addPath("${libDir}/epoxy/src/glx")
addDef(BUILD_GLX) addDef(BUILD_GLX)
endif() endif()
addInclude("${libDir}/epoxy/include") addInclude("${libDir}/epoxy/include")
addInclude("${libDir}/epoxy/src") addInclude("${libDir}/epoxy/src")
finishLibrary() 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()