Merge pull request #4 from cpp3ds/master

Resolved undefined Common::g_scm_branch error.

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)

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})

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