Commit 338ff54f authored by Ryan C. Gordon's avatar Ryan C. Gordon

Add XInput support to Xcode project (untested!).

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403221
parent c0f52b12
...@@ -2565,10 +2565,12 @@ ...@@ -2565,10 +2565,12 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
"SDL_VIDEO_OPENGL_GLX=1", "SDL_VIDEO_OPENGL_GLX=1",
); );
...@@ -2576,6 +2578,7 @@ ...@@ -2576,6 +2578,7 @@
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = /usr/X11R6/include; HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist"; INFOPLIST_FILE = "Info-Framework.plist";
...@@ -2606,10 +2609,12 @@ ...@@ -2606,10 +2609,12 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
"SDL_VIDEO_OPENGL_GLX=1", "SDL_VIDEO_OPENGL_GLX=1",
); );
...@@ -2617,6 +2622,7 @@ ...@@ -2617,6 +2622,7 @@
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = /usr/X11R6/include; HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist"; INFOPLIST_FILE = "Info-Framework.plist";
...@@ -2647,10 +2653,12 @@ ...@@ -2647,10 +2653,12 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
"SDL_VIDEO_OPENGL_GLX=1", "SDL_VIDEO_OPENGL_GLX=1",
); );
...@@ -2658,6 +2666,7 @@ ...@@ -2658,6 +2666,7 @@
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_SYMBOLS_PRIVATE_EXTERN = YES;
HEADER_SEARCH_PATHS = /usr/X11R6/include; HEADER_SEARCH_PATHS = /usr/X11R6/include;
INFOPLIST_FILE = "Info-Framework.plist"; INFOPLIST_FILE = "Info-Framework.plist";
...@@ -2686,16 +2695,19 @@ ...@@ -2686,16 +2695,19 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
); );
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
OTHER_CFLAGS_i386 = ""; OTHER_CFLAGS_i386 = "";
OTHER_CFLAGS_ppc = ""; OTHER_CFLAGS_ppc = "";
...@@ -2715,16 +2727,19 @@ ...@@ -2715,16 +2727,19 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
); );
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
OTHER_CFLAGS_i386 = ""; OTHER_CFLAGS_i386 = "";
OTHER_CFLAGS_ppc = ""; OTHER_CFLAGS_ppc = "";
...@@ -2744,16 +2759,19 @@ ...@@ -2744,16 +2759,19 @@
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4)",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5)",
"SDL_VIDEO_DRIVER_X11_VIDMODE=1", "SDL_VIDEO_DRIVER_X11_VIDMODE=1",
"SDL_VIDEO_DRIVER_X11_XINERAMA=1", "SDL_VIDEO_DRIVER_X11_XINERAMA=1",
"SDL_VIDEO_DRIVER_X11_XME=1", "SDL_VIDEO_DRIVER_X11_XME=1",
"SDL_VIDEO_DRIVER_X11_XRANDR=1", "SDL_VIDEO_DRIVER_X11_XRANDR=1",
"SDL_VIDEO_DRIVER_X11_XINPUT=1",
"SDL_VIDEO_DRIVER_X11_XV=1", "SDL_VIDEO_DRIVER_X11_XV=1",
); );
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "SDL_VIDEO_DRIVER_X11_DYNAMIC=\\\"/usr/X11R6/lib/libX11.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_2 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT=\\\"/usr/X11R6/lib/libXext.6.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_3 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR=\\\"/usr/X11R6/lib/libXrandr.2.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\""; GCC_PREPROCESSOR_DEFINITIONS_QUOTED_4 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER=\\\"/usr/X11R6/lib/libXrender.1.dylib\\\"";
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_5 = "SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT=\\\"/usr/X11R6/lib/libXi.6.dylib\\\"";
OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))"; OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
OTHER_CFLAGS_i386 = ""; OTHER_CFLAGS_i386 = "";
OTHER_CFLAGS_ppc = ""; OTHER_CFLAGS_ppc = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment