diff options
| author |  bunnei | 2014-04-25 10:48:49 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-25 10:48:49 -0400 |
| commit | 2d1c8078c925a8456f456fb94e593a5e44829954 (patch) | |
| tree | 8e8d16a4dd9f019086d802328ece8a86127858ab /src | |
| parent | removed "COVERAGE_" from "GCC_COVERAGE_COMPILE_FLAGS" (diff) | |
| parent | Fixed CMake's import of GLFW. (diff) | |
| download | yuzu-2d1c8078c925a8456f456fb94e593a5e44829954.tar.gz yuzu-2d1c8078c925a8456f456fb94e593a5e44829954.tar.xz yuzu-2d1c8078c925a8456f456fb94e593a5e44829954.zip | |
Merge pull request #4 from cpp3ds/master
Resolved undefined Common::g_scm_branch error.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 2 |
2 files changed, 2 insertions, 2 deletions
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) | |||
| 7 | endif() | 7 | endif() |
| 8 | 8 | ||
| 9 | add_executable(citra ${SRCS}) | 9 | add_executable(citra ${SRCS}) |
| 10 | 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}) | 10 | target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) |
| 11 | 11 | ||
| 12 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) | 12 | #install(TARGETS citra RUNTIME DESTINATION ${bindir}) |
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 @@ | |||
| 11 | namespace Common { | 11 | namespace Common { |
| 12 | 12 | ||
| 13 | const char g_scm_rev[] = GIT_REV; | 13 | const char g_scm_rev[] = GIT_REV; |
| 14 | const char g_scm_ref_spec[] = GIT_BRANCH; | 14 | const char g_scm_branch[] = GIT_BRANCH; |
| 15 | const char g_scm_desc[] = GIT_DESC; | 15 | const char g_scm_desc[] = GIT_DESC; |
| 16 | 16 | ||
| 17 | } // namespace | 17 | } // namespace |