diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-04-25 10:48:49 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-25 10:48:49 -0400 |
| commit | 2d1c8078c925a8456f456fb94e593a5e44829954 (patch) | |
| tree | 8e8d16a4dd9f019086d802328ece8a86127858ab | |
| parent | 15dacc4d3f0f5f7e939bed8129bcffea55a056ea (diff) | |
| parent | c51e4822b1f8b662e7f712731cc2abc37e42592f (diff) | |
Merge pull request #4 from cpp3ds/master
Resolved undefined Common::g_scm_branch error.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 83a4a5f5..a588fe19 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 9b8c3936..0023da2b 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}) diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 512c5bd4..09366e80 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in @@ -11,7 +11,7 @@ namespace Common { const char g_scm_rev[] = GIT_REV; -const char g_scm_ref_spec[] = GIT_BRANCH; +const char g_scm_branch[] = GIT_BRANCH; const char g_scm_desc[] = GIT_DESC; } // namespace |