ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3942 from comex/osx-build-fix 

Fix in-tree build (cmake .) on OS X.
This commit is contained in:
Mat M 2016-06-26 00:35:00 -04:00 committed by GitHub
parent 3a26167148 659d079d5c
commit 3d72fe3173
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -942,7 +942,7 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n" "#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
"#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n" "#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n"
) )
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common") include_directories("${PROJECT_BINARY_DIR}/Source/Core")
######################################## ########################################
# Unit testing. # Unit testing.

2
Source/Core/Common/Version.cpp
View File

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/Common.h" #include "Common/Common.h"
#include "scmrev.h" #include "Common/scmrev.h"
#ifdef _DEBUG #ifdef _DEBUG
#define BUILD_TYPE_STR "Debug " #define BUILD_TYPE_STR "Debug "