actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Big defines patch : replace HAVE_XBOX with HAVE_XDK. In some cases where HAVE_DIRECTX was ambiguous, clarification was added. Another bug surfaced here : Who said FFMPEG was needed on xbox? In any case, investigation of ffmpeg-xbox will commence as soon as we can get SMX to boot again :)

Browse Source
This commit is contained in:
Renaud Lepage
2005-08-23 22:51:21 +00:00
parent 9783942cdc
commit eb0704bf41
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
+1 -1
View File
@@ -13,7 +13,7 @@
#elif defined(HAVE_WIN32) // XXX: Better name for this API? #elif defined(HAVE_WIN32) // XXX: Better name for this API?
#include "ArchHooks_Win32.h" #include "ArchHooks_Win32.h"
#elif defined(HAVE_XBOX) // XXX: Better name for this API? #elif defined(HAVE_XDK)
#include "ArchHooks_Xbox.h" #include "ArchHooks_Xbox.h"
#else #else
stepmania/src/arch/InputHandler/Selector_InputHandler.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* InputHandler drivers selector. */ /* InputHandler drivers selector. */
#if defined(HAVE_DIRECTX) && !defined(XBOX) #if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
#include "InputHandler_DirectInput.h" #include "InputHandler_DirectInput.h"
#endif #endif
@@ -29,7 +29,7 @@
#include "InputHandler_Win32_MIDI.h" #include "InputHandler_Win32_MIDI.h"
#endif #endif
#ifdef HAVE_XBOX #ifdef HAVE_XDK
#include "InputHandler_Xbox.h" #include "InputHandler_Xbox.h"
#endif #endif
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ namespace avcodec
#endif #endif
}; };
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(XBOX)
#pragma comment(lib, "ffmpeg/lib/avcodec.lib") #pragma comment(lib, "ffmpeg/lib/avcodec.lib")
#pragma comment(lib, "ffmpeg/lib/avformat.lib") #pragma comment(lib, "ffmpeg/lib/avformat.lib")
#endif #endif
stepmania/src/arch/MovieTexture/Selector_MovieTexture.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* MovieTexture driver selector. */ /* MovieTexture driver selector. */
#if defined(HAVE_DIRECTX) && !defined(HAVE_XBOX) #if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
#include "MovieTexture_DShow.h" #include "MovieTexture_DShow.h"
#endif #endif
stepmania/src/arch/arch_default.h
+2 -2
View File
@@ -9,9 +9,9 @@
* InputHandler_SDL to be used.) */ * InputHandler_SDL to be used.) */
/* InputHandler drivers */ /* InputHandler drivers */
#if defined (HAVE_XBOX) #if defined (HAVE_XDK)
#define DEFAULT_INPUT_DRIVER_LIST "Xbox" #define DEFAULT_INPUT_DRIVER_LIST "Xbox"
#elif defined(HAVE_DIRECTX) #elif defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para" #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
#elif defined(HAVE_X11) // Prefer X11 over SDL #elif defined(HAVE_X11) // Prefer X11 over SDL
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick" #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
stepmania/src/arch/arch_platform.h
+1 -1
View File
@@ -21,7 +21,7 @@
#endif #endif
#if defined(_XBOX) #if defined(_XBOX)
#define HAVE_DIRECTX #define HAVE_DIRECTX
#define HAVE_XBOX // XXX: Better name for this API? #define HAVE_XDK
#endif #endif
#if defined(LINUX) #if defined(LINUX)
#define HAVE_UNIX // Here just to be explicit. #define HAVE_UNIX // Here just to be explicit.