Make Linux/MacOSX system checks correct in the cmake build. UNIX is true on both linux and osx. The cmake build probably still doesn't work on MacOSX though.

Also added an option to explicitly disable building with MPG framedumps.  To use it add -DENCODE_FRAMEDUMPS=OFF to cmake on the command line.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6429 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/AudioCommon/CMakeLists.txt

@@ -6,7 +6,7 @@ set(SRCS	Src/AudioCommon.cpp
 
 set(LIBS "")
 
-if(APPLE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(SRCS ${SRCS} Src/CoreAudioSoundStream.cpp)
 else()
     if(ALSA_FOUND)
@@ -37,6 +37,6 @@ endif()
 
 add_library(audiocommon STATIC ${SRCS})
 target_link_libraries(audiocommon ${LIBS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/Common/CMakeLists.txt

@@ -40,6 +40,6 @@ if(WIN32)
 endif(WIN32)
 
 add_library(common STATIC ${SRCS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/Core/CMakeLists.txt

@@ -133,9 +133,9 @@ set(SRCS	Src/ActionReplay.cpp
 
 if(WIN32)
 	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp)
-elseif(APPLE)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Apple.cpp)
-elseif(UNIX)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Unix.cpp)
 endif()
 

Source/Core/DSPCore/CMakeLists.txt

@@ -23,6 +23,6 @@ set(SRCS	Src/assemble.cpp
 			Src/Jit/DSPJitMisc.cpp)
 
 add_library(dspcore STATIC ${SRCS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/DebuggerUICommon/CMakeLists.txt

@@ -3,6 +3,6 @@ set(SRCS	Src/CodeView.cpp
 			Src/MemoryView.cpp)
 
 add_library(debugger_ui_util STATIC ${SRCS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/DolphinWX/CMakeLists.txt

@@ -63,9 +63,9 @@ endif(XRANDR_FOUND)
 
 if(WIN32)
 	set(SRCS ${SRCS} Src/stdafx.cpp)
-elseif(APPLE AND NOT wxWidgets_FOUND)
+elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)
 	# TODO
-elseif(APPLE AND wxWidgets_FOUND)
+elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND wxWidgets_FOUND)
 	# TODO
 else()
 	set(SRCS ${SRCS} Src/X11Utils.cpp)

Source/Core/InputCommon/CMakeLists.txt

@@ -11,7 +11,7 @@ if(WIN32)
 				Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
 				Src/ControllerInterface/SDL/SDL.cpp
 				Src/ControllerInterface/XInput/XInput.cpp)
-elseif(APPLE)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(SRCS	${SRCS}
 				Src/ControllerInterface/OSX/OSX.mm
 				Src/ControllerInterface/OSX/OSXKeyboard.mm

Source/Core/VideoCommon/CMakeLists.txt

@@ -40,10 +40,10 @@ if(ENCODE_FRAMEDUMPS OR WIN32)
 endif()
 
 add_library(videocommon STATIC ${SRCS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	if(ENCODE_FRAMEDUMPS)
 		target_link_libraries(videocommon avcodec swscale)
 		add_definitions(-D__STDC_CONSTANT_MACROS)
 	endif()
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/VideoUICommon/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(SRCS	Src/VideoConfigDiag.cpp)
 
 add_library(videouicommon STATIC ${SRCS})
-if(UNIX)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	add_definitions(-fPIC)
-endif(UNIX)
+endif()

Source/Core/wiiuse/CMakeLists.txt

@@ -1,9 +1,9 @@
 set(SRCS	Src/ir.cpp
 			Src/wiiuse.cpp)
 
-if(APPLE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(SRCS ${SRCS} Src/io_osx.m)
-elseif(UNIX AND BLUEZ_FOUND)
+elseif((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND BLUEZ_FOUND)
 	set(SRCS ${SRCS} Src/io_nix.cpp)
 	set(LIBS ${LIBS} bluetooth)
 elseif(WIN32)