|
@@ -473,12 +473,9 @@ if( TORQUE_OPENGL )
|
|
if( TORQUE_OPENGL AND NOT TORQUE_DEDICATED )
|
|
if( TORQUE_OPENGL AND NOT TORQUE_DEDICATED )
|
|
addPath("${srcDir}/gfx/gl")
|
|
addPath("${srcDir}/gfx/gl")
|
|
addPath("${srcDir}/gfx/gl/tGL")
|
|
addPath("${srcDir}/gfx/gl/tGL")
|
|
- addPath("${srcDir}/shaderGen/GLSL")
|
|
|
|
|
|
+ addPath("${srcDir}/shaderGen/GLSL")
|
|
addPath("${srcDir}/terrain/glsl")
|
|
addPath("${srcDir}/terrain/glsl")
|
|
addPath("${srcDir}/forest/glsl")
|
|
addPath("${srcDir}/forest/glsl")
|
|
-
|
|
|
|
- # glew
|
|
|
|
- LIST(APPEND ${PROJECT_NAME}_files "${libDir}/glew/src/glew.c")
|
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
if(WIN32 AND NOT TORQUE_SDL)
|
|
if(WIN32 AND NOT TORQUE_SDL)
|
|
@@ -531,6 +528,9 @@ addLib(squish)
|
|
addLib(collada)
|
|
addLib(collada)
|
|
addLib(pcre)
|
|
addLib(pcre)
|
|
addLib(convexDecomp)
|
|
addLib(convexDecomp)
|
|
|
|
+if (TORQUE_OPENGL)
|
|
|
|
+ addLib(epoxy)
|
|
|
|
+endif()
|
|
|
|
|
|
if(WIN32)
|
|
if(WIN32)
|
|
# copy pasted from T3D build system, some might not be needed
|
|
# copy pasted from T3D build system, some might not be needed
|
|
@@ -590,9 +590,6 @@ endif()
|
|
|
|
|
|
if(TORQUE_OPENGL)
|
|
if(TORQUE_OPENGL)
|
|
addDef(TORQUE_OPENGL)
|
|
addDef(TORQUE_OPENGL)
|
|
- if(WIN32)
|
|
|
|
- addDef(GLEW_STATIC)
|
|
|
|
- endif()
|
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
if(TORQUE_SDL)
|
|
if(TORQUE_SDL)
|
|
@@ -624,7 +621,8 @@ addInclude("${libDir}/opcode")
|
|
addInclude("${libDir}/collada/include")
|
|
addInclude("${libDir}/collada/include")
|
|
addInclude("${libDir}/collada/include/1.4")
|
|
addInclude("${libDir}/collada/include/1.4")
|
|
if(TORQUE_OPENGL)
|
|
if(TORQUE_OPENGL)
|
|
- addInclude("${libDir}/glew/include")
|
|
|
|
|
|
+ addInclude("${libDir}/epoxy/include")
|
|
|
|
+ addInclude("${libDir}/epoxy/src")
|
|
endif()
|
|
endif()
|
|
|
|
|
|
if(UNIX)
|
|
if(UNIX)
|
|
@@ -632,10 +630,6 @@ if(UNIX)
|
|
addInclude("/usr/include/freetype2")
|
|
addInclude("/usr/include/freetype2")
|
|
endif()
|
|
endif()
|
|
|
|
|
|
-if(TORQUE_OPENGL)
|
|
|
|
- addInclude("${libDir}/glew/include")
|
|
|
|
-endif()
|
|
|
|
-
|
|
|
|
# external things
|
|
# external things
|
|
if(WIN32)
|
|
if(WIN32)
|
|
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
|
|
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY INCLUDE_DIRECTORIES $ENV{DXSDK_DIR}/Include)
|