summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-30 08:37:42 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-30 13:45:56 +0200
commita1a5570e9735cb3ead0149b26d00eb4d6ade744f (patch)
treea044f6116c24f0618f34c73154cd8c86e89711c7 /src/citra
parentMerge pull request #1049 from Subv/stencil (diff)
downloadyuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.gz
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.bz2
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.lz
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.xz
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.tar.zst
yuzu-a1a5570e9735cb3ead0149b26d00eb4d6ade744f.zip
Diffstat (limited to '')
-rw-r--r--src/citra/CMakeLists.txt4
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 1d6aac9a9..beb96bd30 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -15,7 +15,7 @@ create_directory_groups(${SRCS} ${HEADERS})
add_executable(citra ${SRCS} ${HEADERS})
target_link_libraries(citra core video_core common)
-target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih)
+target_link_libraries(citra ${GLFW_LIBRARIES} ${OPENGL_gl_LIBRARY} inih glad)
if (MSVC)
target_link_libraries(citra getopt)
endif()
@@ -23,4 +23,4 @@ target_link_libraries(citra ${PLATFORM_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD|NetBSD")
install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-endif() \ No newline at end of file
+endif()
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 6d6656b5a..096efc4a2 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -7,7 +7,7 @@
#include <string>
// Let’s use our own GL header, instead of one from GLFW.
-#include "video_core/renderer_opengl/generated/gl_3_2_core.h"
+#include <glad/glad.h>
#define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h>