From df065b4bf4205db561a5fe7d5652352f6046e40f Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sun, 25 Jul 2010 10:01:51 +0000
Subject: ported dfinput to osx as well (prelimiary, no config dialog yet).
 will eventually replace HIDInput.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@55128 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfinput/pad.c | 4 ++++
 plugins/dfinput/pad.h | 9 +++++++++
 2 files changed, 13 insertions(+)

(limited to 'plugins/dfinput')

diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index e08db98d..a0207aab 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -368,6 +368,8 @@ long PADkeypressed(void) {
 	return s;
 }
 
+#ifndef _MACOSX
+
 long PADconfigure(void) {
 	if (fork() == 0) {
 		execl("cfg/cfgDFInput", "cfgDFInput", NULL);
@@ -383,6 +385,8 @@ void PADabout(void) {
 	}
 }
 
+#endif
+
 long PADtest(void) {
 	return PSE_PAD_ERR_SUCCESS;
 }
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index bee7a2cf..80dd5b0e 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -23,7 +23,9 @@
 extern "C" {
 #endif
 
+#ifndef _MACOSX
 #include "config.h"
+#endif
 
 #include <stdio.h>
 #include <stdint.h>
@@ -33,10 +35,17 @@ extern "C" {
 #include <pthread.h>
 
 #include <SDL.h>
+
+#ifdef _MACOSX
+#include <Carbon/Carbon.h>
+typedef void *Display;
+#define ThreadID ThreadID_MACOSX
+#else
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
+#endif
 
 #include "psemu_plugin_defs.h"
 
-- 
cgit v1.2.3