From 08e1ba746ffa4ce0ed7db1bf1d196125a7816add Mon Sep 17 00:00:00 2001
From: Thomas Edvalson <machin3@gmail.com>
Date: Fri, 25 Apr 2014 10:34:27 -0400
Subject: [PATCH 1/2] Resolved undefined Common::g_scm_branch error.
---
src/common/scm_rev.cpp.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in
index 512c5bd4c..09366e801 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
From c51e4822b1f8b662e7f712731cc2abc37e42592f Mon Sep 17 00:00:00 2001
From: Thomas Edvalson <machin3@gmail.com>
Date: Fri, 25 Apr 2014 10:50:25 -0400
Subject: [PATCH 2/2] Fixed CMake's import of GLFW.
---
CMakeLists.txt | 2 ++
src/citra/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
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})