From 9f4cf7689b04057381b529de89204113b9efe803 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Mon, 28 Feb 2022 16:32:55 +0100 Subject: [PATCH] devendor glfw3 --- CMakeLists.txt | 8 +++++++- src/CMakeLists.txt | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b758422..ee03552 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,13 @@ cmake_minimum_required (VERSION 3.8) project ("NES Emulator") -add_subdirectory("vendor/glfw") +find_package(GLFW3) +if(NOT ${GLFW3_FOUND}) + add_subdirectory("vendor/glfw") + + set(GLFW3_INCLUDE_DIRS "") + set(GLFW3_LIBRARIES glfw) +endif() add_subdirectory("vendor/glad") add_subdirectory("vendor/spdlog") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7e42250..88b4a51 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,13 +9,18 @@ add_executable(nesemu "PPU.cpp" "gfx/Window.cpp" "debugger/CPUWatcher.cpp" - "debugger/Debugger.cpp" "debugger/PPUWatcher.cpp" "debugger/Disassembler.cpp" "debugger/MemoryViewer.cpp" "debugger/NametableViewer.cpp") + "debugger/Debugger.cpp" + "debugger/PPUWatcher.cpp" + "debugger/Disassembler.cpp" + "debugger/MemoryViewer.cpp" + "debugger/NametableViewer.cpp") target_include_directories(nesemu PRIVATE mappers gfx debugger ${IMGUI_INCLUDE} + ${GLFW3_INCLUDE_DIRS} ) target_sources(nesemu PRIVATE @@ -24,7 +29,7 @@ target_sources(nesemu PRIVATE target_link_libraries(nesemu spdlog - glfw + ${GLFW3_LIBRARIES} glad )