diff options
| author | Thomas Edvalson <machin3@gmail.com> | 2014-04-25 16:50:25 +0200 |
|---|---|---|
| committer | Thomas Edvalson <machin3@gmail.com> | 2014-04-25 16:50:25 +0200 |
| commit | c51e4822b1f8b662e7f712731cc2abc37e42592f (patch) | |
| tree | 8e8d16a4dd9f019086d802328ece8a86127858ab | |
| parent | Resolved undefined Common::g_scm_branch error. (diff) | |
| download | yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar.gz yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar.bz2 yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar.lz yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar.xz yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.tar.zst yuzu-c51e4822b1f8b662e7f712731cc2abc37e42592f.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 83a4a5f52..a588fe193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,8 @@ add_definitions(${GCC_COMPILE_FLAGS}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) include(FindOpenGL REQUIRED) include(FindX11 REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_search_module(GLFW REQUIRED glfw3) include_directories(${GLFW_INCLUDE_DIRS}) option(DISABLE_QT4 "Disable Qt4 GUI" OFF) diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 9b8c3936a..0023da2bf 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -7,6 +7,6 @@ if (NOT X11_xf86vmode_LIB) endif() add_executable(citra ${SRCS}) -target_link_libraries(citra core common video_core GLEW glfw3 pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) +target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |