Xcode 5 fixing, part 1.
Need someone on xcode 4.x to confirm this works. Once this file gets fixed, the others will be removed.
This commit is contained in:
Binary file not shown.
@@ -6221,7 +6221,7 @@
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = YES;
|
||||
LastUpgradeCheck = 0460;
|
||||
LastUpgradeCheck = 0500;
|
||||
};
|
||||
buildConfigurationList = AAC845130856A19700A9FEAB /* Build configuration list for PBXProject "stepmania_xcode4.3" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
@@ -8414,6 +8414,7 @@
|
||||
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Libraries";
|
||||
LINKER_DISPLAYS_MANGLED_NAMES = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.6;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
|
||||
SDKROOT = "";
|
||||
SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
|
||||
@@ -8703,6 +8704,7 @@
|
||||
"HAVE_WAITPID=1",
|
||||
"SIZEOF_LONG=4",
|
||||
"$(FPM)",
|
||||
FPM_DEFAULT,
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
||||
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
|
||||
@@ -8738,6 +8740,7 @@
|
||||
"HAVE_WAITPID=1",
|
||||
"SIZEOF_LONG=4",
|
||||
"$(FPM)",
|
||||
FPM_DEFAULT,
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
||||
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
|
||||
@@ -8776,6 +8779,7 @@
|
||||
"HAVE_WAITPID=1",
|
||||
"SIZEOF_LONG=4",
|
||||
"$(FPM)",
|
||||
FPM_DEFAULT,
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
||||
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
|
||||
|
||||
@@ -223,11 +223,10 @@ void ArchHooks_MacOSX::DumpDebugInfo()
|
||||
// Get system version
|
||||
RString sSystemVersion;
|
||||
{
|
||||
long major = 0, minor = 0, bugFix = 0;
|
||||
long major = static_cast<long>(gestaltSystemVersionMajor);
|
||||
long minor = static_cast<long>(gestaltSystemVersionMinor);
|
||||
long bugFix = static_cast<long>(gestaltSystemVersionBugFix);
|
||||
|
||||
Gestalt( gestaltSystemVersionMajor, &major );
|
||||
Gestalt( gestaltSystemVersionMinor, &minor );
|
||||
Gestalt( gestaltSystemVersionBugFix, &bugFix );
|
||||
if( bugFix )
|
||||
sSystemVersion = ssprintf( "Mac OS X %ld.%ld.%ld", major, minor, bugFix );
|
||||
else
|
||||
|
||||
@@ -25,7 +25,7 @@ void InputHandler_MacOSX_HID::QueueCallback( void *target, int result, void *ref
|
||||
IOHIDQueueInterface **queue = (IOHIDQueueInterface **)sender;
|
||||
IOHIDEventStruct event;
|
||||
AbsoluteTime zeroTime = { 0, 0 };
|
||||
HIDDevice *dev = This->m_vDevices[int( refcon )];
|
||||
HIDDevice *dev = This->m_vDevices[size_t( refcon )];
|
||||
vector<DeviceInput> vPresses;
|
||||
|
||||
while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess )
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "RageLog.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <CarbonCore/Files.h>
|
||||
#include <IOKit/IOKitLib.h>
|
||||
#include <IOKit/storage/IOMedia.h>
|
||||
#include <IOKit/usb/USBSpec.h>
|
||||
|
||||
@@ -43,18 +43,6 @@ inline Boolean LongValue( CFTypeRef o, long &n )
|
||||
return CFNumberGetValue( CFNumberRef(o), kCFNumberLongType, &n );
|
||||
}
|
||||
|
||||
namespace __gnu_cxx
|
||||
{
|
||||
template<>
|
||||
struct hash<IOHIDElementCookie> : private hash<uintptr_t>
|
||||
{
|
||||
size_t operator()( const IOHIDElementCookie& cookie ) const
|
||||
{
|
||||
return hash<unsigned long>::operator()( uintptr_t(cookie) );
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/* This is just awful, these aren't objects, treating them as such
|
||||
* leads to: (*object)->function(object [, argument]...)
|
||||
* Instead, do: CALL(object, function [, argument]...)
|
||||
|
||||
@@ -461,9 +461,9 @@ void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
|
||||
ctx->bp = (void *) uc->uc_mcontext->ss.ebp;
|
||||
ctx->sp = (void *) uc->uc_mcontext->ss.esp;
|
||||
#else
|
||||
ctx->ip = (void *) uc->uc_mcontext->__ss.__eip;
|
||||
ctx->bp = (void *) uc->uc_mcontext->__ss.__ebp;
|
||||
ctx->sp = (void *) uc->uc_mcontext->__ss.__esp;
|
||||
ctx->ip = (void *) uc->uc_mcontext->__ss.__rip;
|
||||
ctx->bp = (void *) uc->uc_mcontext->__ss.__rbp;
|
||||
ctx->sp = (void *) uc->uc_mcontext->__ss.__rsp;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user