From 9bbd5b9157339ef6c60636df3cc90c1c894da088 Mon Sep 17 00:00:00 2001 From: nakeee Date: Mon, 7 Feb 2011 15:51:38 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 4 ++++ Source/Core/InputCommon/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a3bb1e1d1..c97e91285a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 59c6d09175..3a8ea1e7a2 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -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}