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: Resolved undefined Common::g_scm_branch error.

---
 src/common/scm_rev.cpp.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.3


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: Fixed CMake's import of GLFW.

---
 src/citra/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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})
-- 
cgit v1.2.3