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

__MACOSX__ --> MACOSX, keep __MACOSX__ for ogg.

Browse Source
This commit is contained in:
Steve Checkoway
2005-10-24 10:37:56 +00:00
parent 283747e8c9
commit aa0f90feae
24 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#if !defined(__MACOSX__) #if !defined(MACOSX)
# include <GL/gl.h> # include <GL/gl.h>
# include <GL/glu.h> # include <GL/glu.h>
#else #else
@@ -30,7 +30,7 @@
#include <set> #include <set>
#include <sstream> #include <sstream>
#if defined(__MACOSX__) #if defined(MACOSX)
#include "archutils/Darwin/Vsync.h" #include "archutils/Darwin/Vsync.h"
#endif #endif
stepmania/src/RageDisplay_OGL_Extensions.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include <set> #include <set>
#if !defined(__MACOSX__) #if !defined(MACOSX)
# include <GL/gl.h> # include <GL/gl.h>
# include <GL/glu.h> # include <GL/glu.h>
#else #else
@@ -88,7 +88,7 @@ void GLExt_t::Load( LowLevelWindow *pWind )
#if defined(WIN32) #if defined(WIN32)
if( HasExtension("WGL_EXT_swap_control") ) if( HasExtension("WGL_EXT_swap_control") )
wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) pWind->GetProcAddress("wglSwapIntervalEXT"); wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) pWind->GetProcAddress("wglSwapIntervalEXT");
#elif defined(__MACOSX__) #elif defined(MACOSX)
wglSwapIntervalEXT = wglSwapIntervalEXT; wglSwapIntervalEXT = wglSwapIntervalEXT;
#endif #endif
stepmania/src/RageFileDriverDeflate.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma comment(lib, "zlib/zdll.lib") #pragma comment(lib, "zlib/zdll.lib")
#endif #endif
#elif defined(__MACOSX__) #elif defined(MACOSX)
/* Since crypto++ was added to the repository, <zlib.h> includes the zlib.h /* Since crypto++ was added to the repository, <zlib.h> includes the zlib.h
* in there rather than the correct system one. I don't know why it would do * in there rather than the correct system one. I don't know why it would do
* this since crypto51 is not being listed as one of the include directories. * this since crypto51 is not being listed as one of the include directories.
stepmania/src/RageFileManager.cpp
+2 -2
View File
@@ -220,7 +220,7 @@ static void ChangeToDirOfExecutable( CString argv0 )
* written through RageFile. See also RageFileManager::RageFileManager. */ * written through RageFile. See also RageFileManager::RageFileManager. */
#if defined(_WINDOWS) #if defined(_WINDOWS)
chdir( DirOfExecutable + "/.." ); chdir( DirOfExecutable + "/.." );
#elif defined(__MACOSX__) #elif defined(MACOSX)
chdir( DirOfExecutable + "/../../.." ); chdir( DirOfExecutable + "/../../.." );
#endif #endif
} }
@@ -297,7 +297,7 @@ void RageFileManager::MountInitialFilesystems()
ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) ); ASSERT_M( parts.size() > 1, ssprintf("Strange DirOfExecutable: %s", DirOfExecutable.c_str()) );
CString Dir = join( "/", parts.begin(), parts.end()-1 ); CString Dir = join( "/", parts.begin(), parts.end()-1 );
RageFileManager::Mount( "dir", Dir, "/" ); RageFileManager::Mount( "dir", Dir, "/" );
#elif defined(__MACOSX__) #elif defined(MACOSX)
CHECKPOINT_M( ssprintf("DOE \"%s\"", DirOfExecutable.c_str()) ); CHECKPOINT_M( ssprintf("DOE \"%s\"", DirOfExecutable.c_str()) );
CStringArray parts; CStringArray parts;
split( DirOfExecutable, "/", parts ); split( DirOfExecutable, "/", parts );
stepmania/src/RageMath.cpp
+3 -3
View File
@@ -13,7 +13,7 @@
#include "arch/Dialog/Dialog.h" #include "arch/Dialog/Dialog.h"
#include <float.h> #include <float.h>
#if defined(__MACOSX__) #if defined(MACOSX)
// Work around global namespace pollution. // Work around global namespace pollution.
namespace vblas namespace vblas
{ {
@@ -90,7 +90,7 @@ void RageVec3TransformNormal( RageVector3* pOut, const RageVector3* pV, const Ra
void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM ) void RageVec4TransformCoord( RageVector4* pOut, const RageVector4* pV, const RageMatrix* pM )
{ {
#if defined(__MACOSX__) #if defined(MACOSX)
// (M^t * v)^t = v^t * M // (M^t * v)^t = v^t * M
cblas_sgemv(CblasRowMajor, CblasTrans, 4, 4, 1, &pM->m00, 4, &pV->x, 1, cblas_sgemv(CblasRowMajor, CblasTrans, 4, 4, 1, &pM->m00, 4, &pV->x, 1,
0, &pOut->x, 1); 0, &pOut->x, 1);
@@ -135,7 +135,7 @@ RageMatrix RageMatrix::GetTranspose() const
void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB ) void RageMatrixMultiply( RageMatrix* pOut, const RageMatrix* pA, const RageMatrix* pB )
{ {
#if defined(__MACOSX__) #if defined(MACOSX)
cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, 4, 4, 4, 1, cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, 4, 4, 4, 1,
&pB->m00, 4, &pA->m00, 4, 0, &pOut->m00, 4); &pB->m00, 4, &pA->m00, 4, 0, &pOut->m00, 4);
#else #else
stepmania/src/RageSurface_Load_PNG.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#if defined(_XBOX) #if defined(_XBOX)
# include <malloc.h> // for alloca # include <malloc.h> // for alloca
# include "archutils/Xbox/VirtualMemory.h" # include "archutils/Xbox/VirtualMemory.h"
#elif !defined(WIN32) && !defined(__MACOSX__) #elif !defined(WIN32) && !defined(MACOSX)
# include <alloca.h> # include <alloca.h>
#endif #endif
stepmania/src/RageThreads.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#if defined(CRASH_HANDLER) #if defined(CRASH_HANDLER)
#if defined(_WINDOWS) #if defined(_WINDOWS)
#include "archutils/Win32/crash.h" #include "archutils/Win32/crash.h"
#elif defined(LINUX) || defined(__MACOSX__) #elif defined(LINUX) || defined(MACOSX)
#include "archutils/Unix/CrashHandler.h" #include "archutils/Unix/CrashHandler.h"
#endif #endif
#endif #endif
stepmania/src/SDL_utils.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ CString mySDL_GetError()
void mySDL_WM_SetIcon( CString sIconFile ) void mySDL_WM_SetIcon( CString sIconFile )
{ {
#if !defined(__MACOSX__) #if !defined(MACOSX)
if( sIconFile.empty() ) if( sIconFile.empty() )
{ {
SDL_WM_SetIcon(NULL, NULL); SDL_WM_SetIcon(NULL, NULL);
stepmania/src/StepMania.cpp
+2 -2
View File
@@ -1330,7 +1330,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
return false; // Attract need to know because they go to TitleMenu on > 1 credit return false; // Attract need to know because they go to TitleMenu on > 1 credit
} }
#ifndef __MACOSX__ #ifndef MACOSX
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) ) if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) )
{ {
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
@@ -1355,7 +1355,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
#endif #endif
bool bDoScreenshot = bool bDoScreenshot =
#if defined(__MACOSX__) #if defined(MACOSX)
/* Pressing F13 on an Apple keyboard sends KEY_PRINT. /* Pressing F13 on an Apple keyboard sends KEY_PRINT.
* However, notebooks don't have F13. Use cmd-F12 then*/ * However, notebooks don't have F13. Use cmd-F12 then*/
input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) && input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) &&
stepmania/src/arch/ArchHooks/Selector_ArchHooks.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "arch/arch_platform.h" #include "arch/arch_platform.h"
/* ArchHooks driver selector. */ /* ArchHooks driver selector. */
#if defined(__MACOSX__) #if defined(MACOSX)
#include "ArchHooks_darwin.h" #include "ArchHooks_darwin.h"
#elif defined(UNIX) #elif defined(UNIX)
stepmania/src/arch/Dialog/Selector_Dialog.h
+1 -1
View File
@@ -7,7 +7,7 @@
#if defined(WIN32) #if defined(WIN32)
#include "DialogDriver_Win32.h" #include "DialogDriver_Win32.h"
#elif defined(__MACOSX__) #elif defined(MACOSX)
#include "DialogDriver_Cocoa.h" #include "DialogDriver_Cocoa.h"
#endif #endif
stepmania/src/arch/InputHandler/Selector_InputHandler.h
+1 -1
View File
@@ -17,7 +17,7 @@
// NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on. // NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on.
#if defined(HAVE_X11) #if defined(HAVE_X11)
#include "InputHandler_X11.h" #include "InputHandler_X11.h"
#elif defined(__MACOSX__) #elif defined(MACOSX)
#include "InputHandler_Carbon.h" #include "InputHandler_Carbon.h"
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#include "InputHandler_SDL.h" #include "InputHandler_SDL.h"
stepmania/src/arch/LoadingWindow/Selector_LoadingWindow.h
+1 -1
View File
@@ -6,7 +6,7 @@
/* LoadingWindow driver selector. */ /* LoadingWindow driver selector. */
#include "LoadingWindow_Null.h" #include "LoadingWindow_Null.h"
#if defined(__MACOSX__) #if defined(MACOSX)
#include "LoadingWindow_Cocoa.h" #include "LoadingWindow_Cocoa.h"
#elif defined(HAVE_GTK) #elif defined(HAVE_GTK)
stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
+14
View File
@@ -154,7 +154,10 @@ CString RageSound_CA::Init()
RageSound_CA::~RageSound_CA() RageSound_CA::~RageSound_CA()
{ {
if( mOutputDevice != NULL ) if( mOutputDevice != NULL )
{
mOutputDevice->StopIOProc( GetData ); mOutputDevice->StopIOProc( GetData );
mOutputDevice->RemoveIOProc( GetData );
}
delete mOutputDevice; delete mOutputDevice;
if( mConverter != NULL ) if( mConverter != NULL )
@@ -163,10 +166,21 @@ RageSound_CA::~RageSound_CA()
int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const
{ {
#if 0
AudioTimeStamp inTime;
AudioTimeStamp outTime;
inTime.mHostTime = AudioGetCurrentHostTime();
inTime.mFlags = kAudioTimeStampHostTimeValid;
outTime.mFlags = kAudioTimeStampSampleTimeValid;
mOutputDevice->TranslateTime(inTime, outTime);
return int64_t(outTime.mSampleTime);
#else
AudioTimeStamp time; AudioTimeStamp time;
mOutputDevice->GetCurrentTime( time ); mOutputDevice->GetCurrentTime( time );
return int64_t( time.mSampleTime ); return int64_t( time.mSampleTime );
#endif
} }
OSStatus RageSound_CA::GetData( AudioDeviceID inDevice, OSStatus RageSound_CA::GetData( AudioDeviceID inDevice,
stepmania/src/arch/Sound/Selector_RageSoundDriver.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include "RageSoundDriver_ALSA9_Software.h" #include "RageSoundDriver_ALSA9_Software.h"
#endif #endif
#if defined(__MACOSX__) #if defined(MACOSX)
#include "RageSoundDriver_CA.h" #include "RageSoundDriver_CA.h"
#endif #endif
stepmania/src/arch/Threads/Threads_Pthreads.cpp
+3 -3
View File
@@ -10,7 +10,7 @@
#include "archutils/Unix/RunningUnderValgrind.h" #include "archutils/Unix/RunningUnderValgrind.h"
#endif #endif
#if defined(__MACOSX__) #if defined(MACOSX)
#include "archutils/Darwin/DarwinThreadHelpers.h" #include "archutils/Darwin/DarwinThreadHelpers.h"
#endif #endif
@@ -109,7 +109,7 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads()
} }
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__) #if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
static bool UseTimedlock() static bool UseTimedlock()
{ {
#if defined(LINUX) #if defined(LINUX)
@@ -336,7 +336,7 @@ void SemaImpl_Pthreads::Post()
bool SemaImpl_Pthreads::Wait() bool SemaImpl_Pthreads::Wait()
{ {
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(__MACOSX__) #if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) || defined(MACOSX)
if( UseTimedlock() ) if( UseTimedlock() )
{ {
timeval tv; timeval tv;
stepmania/src/arch/arch_default.h
+1 -1
View File
@@ -15,7 +15,7 @@
#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"
#elif defined(__MACOSX__) #elif defined(MACOSX)
# define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL" # define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#define DEFAULT_INPUT_DRIVER_LIST "SDL" #define DEFAULT_INPUT_DRIVER_LIST "SDL"
stepmania/src/archutils/Darwin/arch_setup.h
+3
View File
@@ -30,6 +30,9 @@ typedef unsigned long long UInt64;
#endif #endif
#define ENDIAN_BIG #define ENDIAN_BIG
#ifndef MACOSX
# define MACOSX
#endif
#ifndef __MACOSX__ #ifndef __MACOSX__
# define __MACOSX__ # define __MACOSX__
#endif #endif
stepmania/src/archutils/Unix/Backtrace.h
+1 -1
View File
@@ -14,7 +14,7 @@ struct BacktraceContext
pid_t pid; pid_t pid;
#endif #endif
#if defined(__MACOSX__) #if defined(MACOSX)
void *FramePtr, *PC; void *FramePtr, *PC;
#endif #endif
}; };
stepmania/src/archutils/Unix/BacktraceNames.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include "RageUtil.h" #include "RageUtil.h"
#if defined(__MACOSX__) #if defined(MACOSX)
#include "archutils/Darwin/Crash.h" #include "archutils/Darwin/Crash.h"
#endif #endif
stepmania/src/archutils/Unix/CrashHandler.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "CrashHandler.h" #include "CrashHandler.h"
#include "CrashHandlerInternal.h" #include "CrashHandlerInternal.h"
#if defined(__MACOSX__) #if defined(MACOSX)
# include "../Darwin/DarwinThreadHelpers.h" # include "../Darwin/DarwinThreadHelpers.h"
#endif #endif
stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+4 -4
View File
@@ -16,7 +16,7 @@
#include "RageLog.h" /* for RageLog::GetAdditionalLog, etc. only */ #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc. only */
#include "ProductInfo.h" #include "ProductInfo.h"
#if defined(__MACOSX__) #if defined(MACOSX)
#include "archutils/Darwin/Crash.h" #include "archutils/Darwin/Crash.h"
#endif #endif
@@ -58,7 +58,7 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers )
} }
} }
#if !defined(__MACOSX__) #if !defined(MACOSX)
const char *SignalCodeName( int signo, int code ) const char *SignalCodeName( int signo, int code )
{ {
switch( code ) switch( code )
@@ -289,7 +289,7 @@ static void child_process()
{ {
CString Signal = SignalName( crash.signal ); CString Signal = SignalName( crash.signal );
#if !defined(__MACOSX__) #if !defined(MACOSX)
reason = ssprintf( "%s - %s", Signal.c_str(), SignalCodeName(crash.signal, crash.si.si_code) ); reason = ssprintf( "%s - %s", Signal.c_str(), SignalCodeName(crash.signal, crash.si.si_code) );
#else #else
reason = Signal; reason = Signal;
@@ -340,7 +340,7 @@ static void child_process()
fprintf(CrashDump, "-- End of report\n"); fprintf(CrashDump, "-- End of report\n");
fclose(CrashDump); fclose(CrashDump);
#if defined(__MACOSX__) #if defined(MACOSX)
/* Forcibly kill our parent. */ /* Forcibly kill our parent. */
kill( getppid(), SIGKILL ); kill( getppid(), SIGKILL );
InformUserOfCrash( sCrashInfoPath ); InformUserOfCrash( sCrashInfoPath );
stepmania/src/archutils/Unix/SignalHandler.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <cerrno> #include <cerrno>
#if defined(__MACOSX__) #if defined(MACOSX)
extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss ); extern "C" int sigaltstack( const struct sigaltstack *ss, struct sigaltstack *oss );
#define MAP_ANONYMOUS MAP_ANON #define MAP_ANONYMOUS MAP_ANON
#endif #endif
stepmania/src/global.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#if defined(CRASH_HANDLER) && (defined(LINUX) || defined(__MACOSX__)) #if defined(CRASH_HANDLER) && (defined(LINUX) || defined(MACOSX))
#include "archutils/Unix/CrashHandler.h" #include "archutils/Unix/CrashHandler.h"
#endif #endif