N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4 from cpp3ds/master

Browse source 
Resolved undefined Common::g_scm_branch error.
This commit is contained in:
bunnei 2014-04-25 10:48:49 -04:00
commit 2d1c8078c9
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -13,6 +13,8 @@ add_definitions(${GCC_COMPILE_FLAGS})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
include(FindOpenGL REQUIRED) include(FindOpenGL REQUIRED)
include(FindX11 REQUIRED) include(FindX11 REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_search_module(GLFW REQUIRED glfw3)
include_directories(${GLFW_INCLUDE_DIRS}) include_directories(${GLFW_INCLUDE_DIRS})
option(DISABLE_QT4 "Disable Qt4 GUI" OFF) option(DISABLE_QT4 "Disable Qt4 GUI" OFF)

2
src/citra/CMakeLists.txt
View file

@ -7,6 +7,6 @@ if (NOT X11_xf86vmode_LIB)
endif() endif()
add_executable(citra ${SRCS}) 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}) #install(TARGETS citra RUNTIME DESTINATION ${bindir})

2
src/common/scm_rev.cpp.in
View file

@ -11,7 +11,7 @@
namespace Common { namespace Common {
const char g_scm_rev[] = GIT_REV; 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; const char g_scm_desc[] = GIT_DESC;
} // namespace } // namespace