ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Move the include directory location for Externals/GL so no other library includes global GL folder first.

This commit is contained in:
Ryan Houdek 2014-01-13 03:33:33 -06:00 committed by degasus
parent 3d4d3f6b11
commit c744aca323
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -293,6 +293,8 @@ if(ANDROID)
set(USE_GLES3 1) set(USE_GLES3 1)
endif() endif()
include_directories(Externals/GL)
# For now GLES and EGL are tied to each other. # For now GLES and EGL are tied to each other.
# Enabling GLES also disables the OpenGL plugin. # Enabling GLES also disables the OpenGL plugin.
if(USE_GLES3) if(USE_GLES3)
@ -649,8 +651,6 @@ else()
include_directories(Externals/SOIL) include_directories(Externals/SOIL)
endif() endif()
include_directories(Externals/GL)
if (ANDROID) if (ANDROID)
message("Using static iconv from Externals") message("Using static iconv from Externals")
include_directories(Externals/libiconv-1.14/include) include_directories(Externals/libiconv-1.14/include)