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

Small fix for cmake on osx, more work left to be done 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7096 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2011-02-07 15:51:38 +00:00
parent 6391393c06
commit 9bbd5b9157
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -84,6 +84,10 @@ if(UNIX AND NOT APPLE)
endif(VISIBILITY_HIDDEN)
endif()
if (APPLE)
add_definitions(-x objective-c++)
endif()
if(WIN32)
add_definitions(-D_SECURE_SCL=0)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)

2
Source/Core/InputCommon/CMakeLists.txt
View File

@ -15,7 +15,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(SRCS ${SRCS}
Src/ControllerInterface/OSX/OSX.mm
Src/ControllerInterface/OSX/OSXKeyboard.mm
Src/ControllerInterface/OSX/OSXMouse.mm
Src/ControllerInterface/OSX/OSXJoystick.mm
Src/ControllerInterface/SDL/SDL.cpp)
elseif(X11_FOUND)
set(SRCS ${SRCS}