Merge branch 'master' of github.com:Lauchmelder23/NESemu
This commit is contained in:
commit
a93d653a93
|
@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.8)
|
||||||
project ("NES Emulator")
|
project ("NES Emulator")
|
||||||
|
|
||||||
find_package(glfw3)
|
find_package(glfw3)
|
||||||
if(NOT GLFW3_FOUND)
|
if(NOT glfw3_FOUND)
|
||||||
add_subdirectory("vendor/glfw")
|
add_subdirectory("vendor/glfw")
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory("vendor/glad")
|
add_subdirectory("vendor/glad")
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <glfw/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
|
||||||
#include <imgui/backends/imgui_impl_glfw.h>
|
#include <imgui/backends/imgui_impl_glfw.h>
|
||||||
#include <imgui/backends/imgui_impl_opengl3.h>
|
#include <imgui/backends/imgui_impl_opengl3.h>
|
||||||
|
|
Loading…
Reference in a new issue