diff options
| author | 2014-08-23 21:00:08 -0300 | |
|---|---|---|
| committer | 2014-09-01 17:41:56 -0300 | |
| commit | 478289140daae28cf7eabf54af3addf476aaad9c (patch) | |
| tree | de13d92f26abaaf5eb0348ae35b2d1c23be497c7 /src/citra | |
| parent | Merge pull request #84 from bunnei/fix-hw-synchronization (diff) | |
| download | yuzu-478289140daae28cf7eabf54af3addf476aaad9c.tar.gz yuzu-478289140daae28cf7eabf54af3addf476aaad9c.tar.xz yuzu-478289140daae28cf7eabf54af3addf476aaad9c.zip | |
Replace GLEW with a glLoadGen loader.
This should fix the GL loading errors that occur in some drivers due to
the use of deprecated functions by GLEW. Side benefits are more accurate
auto-completion (deprecated function and symbols don't exist) and faster
pointer loading (less entrypoints to load). In addition it removes an
external library depency, simplifying the build system a bit and
eliminating one set of binary libraries for Windows.
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 1cbe22cc0..bd6c4a1a8 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -10,9 +10,9 @@ endif() | |||
| 10 | add_executable(citra ${SRCS} ${HEADERS}) | 10 | add_executable(citra ${SRCS} ${HEADERS}) |
| 11 | 11 | ||
| 12 | if (APPLE) | 12 | if (APPLE) |
| 13 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) | 13 | target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES}) |
| 14 | else() | 14 | else() |
| 15 | target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) | 15 | target_link_libraries(citra core common video_core pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) |
| 16 | endif() | 16 | endif() |
| 17 | 17 | ||
| 18 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) | 18 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 5898ec177..c1b41203b 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <GL/glew.h> | ||
| 8 | #include <GLFW/glfw3.h> | 7 | #include <GLFW/glfw3.h> |
| 9 | 8 | ||
| 10 | #include "common/emu_window.h" | 9 | #include "common/emu_window.h" |