Update other arches. Not tested.

2006-11-18 19:35:02 +00:00
parent 6365e3607f
commit a25915855a
19 changed files with 19 additions and 9 deletions
@@ -22,6 +22,8 @@
 int __stdcall AfxMessageBox(LPCTSTR lpszText, UINT nType, UINT nIDHelp);
 #endif

+REGISTER_DIALOG_DRIVER_CLASS( Win32 );
+
 static bool g_bHush;
 static RString g_sMessage;
 static bool g_bAllowHush;
@@ -11,7 +11,6 @@ public:
 	Dialog::Result AbortRetryIgnore( RString sMessage, RString sID );
 	Dialog::Result AbortRetry( RString sMessage, RString sID );
 };
-#define USE_DIALOG_DRIVER_WIN32

 #endif

@@ -14,6 +14,8 @@

 #include "InputHandler_DirectInputHelper.h"

+REGISTER_INPUT_HANDLER_CLASS( DirectInput );
+
 static vector<DIDevice> Devices;

 /* Number of joysticks found: */
@@ -34,7 +34,6 @@ private:
 	void StartThread();
 	void ShutdownThread();
 };
-#define USE_INPUT_HANDLER_DIRECTINPUT

 #endif

@@ -13,6 +13,8 @@

 #include <set>

+REGISTER_INPUT_HANDLER_CLASS2( Joystick, InputHandler_Linux_Joystick );
+
 static const char *Paths[InputHandler_Linux_Joystick::NUM_JOYSTICKS] =
 {
 	"/dev/js0",
@@ -22,7 +22,6 @@ private:
 	RageThread m_InputThread;
 	bool m_bShutdown;
 };
-#define USE_INPUT_HANDLER_LINUX_JOYSTICK

 #endif

@@ -22,6 +22,7 @@
 #include <linux/keyboard.h>
 #include <termios.h>

+REGISTER_INPUT_HANDLER_CLASS2( tty, InputHandler_Linux_tty );

 /* Map from keys (ignoring shifts) to SDLK values. */
 static int keys[NR_KEYS];
@@ -14,7 +14,6 @@ public:
 	~InputHandler_Linux_tty();
 	void GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut );
 };
-#define USE_INPUT_HANDLER_LINUX_TTY

 #endif

@@ -8,6 +8,8 @@

 #pragma comment (lib,"winmm.lib")

+REGISTER_INPUT_HANDLER_CLASS2( MIDI, InputHandler_Win32_MIDI );
+
 static HMIDIIN g_device;
 static void CALLBACK midiCallback(HMIDIIN g_device, UINT status, DWORD instancePtr, DWORD data, DWORD timestamp);

@@ -17,7 +17,6 @@ public:
 private:
 	bool m_bFoundDevice;
 };
-#define USE_INPUT_HANDLER_WIN32_MIDI

 #endif

@@ -13,6 +13,8 @@ extern "C" {
 #include "archutils/Win32/ddk/hidsdi.h"
 }

+REGISTER_INPUT_HANDLER_CLASS( Para, InputHandler_Win32_Para );
+
 static void InitHack( HANDLE h )
 {
 	UCHAR hack[] = {0, 1};
@@ -11,7 +11,6 @@ public:
 	InputHandler_Win32_Para();
 	void GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut );
 };
-#define USE_INPUT_HANDLER_WIN32_PARA

 #endif

@@ -8,6 +8,8 @@
 #include "archutils/Win32/ErrorStrings.h"
 #include "archutils/Win32/USB.h"

+REGISTER_INPUT_HANDLER_CLASS2( Pump, InputHandler_Win32_Pump );
+
 InputHandler_Win32_Pump::InputHandler_Win32_Pump()
 {
 	m_bShutdown = false;
@@ -23,7 +23,6 @@ private:
 	void InputThreadMain();
 	void HandleInput( int devno, int event );
 };
-#define USE_INPUT_HANDLER_WIN32_PUMP

 #endif

@@ -8,6 +8,8 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>

+REGISTER_INPUT_HANDLER_CLASS( X11 );
+
 static DeviceButton XSymToDeviceButton( int key )
 {
 #define KEY_INV DeviceButton_Invalid
@@ -13,7 +13,6 @@ public:
 	void Update();
 	void GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut );
 };
-#define USE_INPUT_HANDLER_X11

 #endif

@@ -7,6 +7,8 @@

 #define NUM_PORTS 4

+REGISTER_INPUT_HANDLER_CLASS( Xbox );
+
 class InputHandler_Xbox: public InputHandler
 {
 	HANDLE joysticks[NUM_JOYSTICKS];
@@ -29,6 +29,8 @@
 #pragma comment(lib, "vfw32.lib")
 #endif

+REGISTER_MOVIE_TEXTURE_CLASS( DShow );
+
 static RString FourCCToString( int fcc )
 {
 	char c[4];
@@ -70,7 +70,6 @@ private:
 	bool					m_bLoop;
 	bool					m_bPlaying;
 };
-#define USE_MOVIE_TEXTURE_DSHOW

 #endif