zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors and warnings in Mac PowerPC target 

Tested with GCC 5.2 on 10.4 (32-bit only) and Clang from Xcode 8.2 on 10.12 (64-bit only)
This commit is contained in:
alexey.lysiuk 2017-03-12 13:10:15 +02:00
parent bfc8c614a0
commit 23130678a1
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/posix/cocoa/i_main.mm
View File

@ -173,7 +173,9 @@ static void I_DetectOS()
"Unknown"; "Unknown";
#endif #endif
Printf("OS: %s %d.%d.%d (%s) %s\n", name, majorVersion, minorVersion, bugFixVersion, release, architecture); Printf("OS: %s %d.%d.%d (%s) %s\n", name,
int(majorVersion), int(minorVersion), int(bugFixVersion),
release, architecture);
} }

19
src/sound/music_audiotoolbox_mididevice.cpp
View File

@ -35,7 +35,7 @@
{ \ { \
DPrintf(DMSG_ERROR, \ DPrintf(DMSG_ERROR, \
"Failed with error 0x%08X at " __FILE__ ":%d:\n> %s", \ "Failed with error 0x%08X at " __FILE__ ":%d:\n> %s", \
result, __LINE__, #CALL); \ int(result), __LINE__, #CALL); \
return __VA_ARGS__; \ return __VA_ARGS__; \
} \ } \
} }
@ -55,7 +55,7 @@ int AudioToolboxMIDIDevice::Open(void (*callback)(unsigned int, void *, DWORD, D
return 1; return 1;
} }
CFRunLoopAddTimer(CFRunLoopGetMain(), m_timer, kCFRunLoopDefaultMode); CFRunLoopAddTimer(CFRunLoopGetCurrent(), m_timer, kCFRunLoopDefaultMode);
m_callback = callback; m_callback = callback;
m_userData = userData; m_userData = userData;
@ -73,7 +73,7 @@ void AudioToolboxMIDIDevice::Close()
if (nullptr != m_timer) if (nullptr != m_timer)
{ {
CFRunLoopRemoveTimer(CFRunLoopGetMain(), m_timer, kCFRunLoopDefaultMode); CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), m_timer, kCFRunLoopDefaultMode);
CFRelease(m_timer); CFRelease(m_timer);
m_timer = nullptr; m_timer = nullptr;
@ -142,9 +142,16 @@ int AudioToolboxMIDIDevice::Resume()
AUNode node; AUNode node;
AT_MIDI_CHECK_ERROR(AUGraphGetIndNode(graph, i, &node), false); AT_MIDI_CHECK_ERROR(AUGraphGetIndNode(graph, i, &node), false);
AudioComponentDescription desc = {};
AudioUnit audioUnit = nullptr; AudioUnit audioUnit = nullptr;
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
ComponentDescription desc = {};
UInt32 classdatasize = 0;
void *classdata = nullptr;
AT_MIDI_CHECK_ERROR(AUGraphGetNodeInfo(graph, node, &desc, &classdatasize, &classdata, &audioUnit), false);
#else // 10.5 and above
AudioComponentDescription desc = {};
AT_MIDI_CHECK_ERROR(AUGraphNodeInfo(graph, node, &desc, &audioUnit), false); AT_MIDI_CHECK_ERROR(AUGraphNodeInfo(graph, node, &desc, &audioUnit), false);
#endif // prior to 10.5
if ( kAudioUnitType_Output != desc.componentType if ( kAudioUnitType_Output != desc.componentType
|| kAudioUnitSubType_DefaultOutput != desc.componentSubType) || kAudioUnitSubType_DefaultOutput != desc.componentSubType)
@ -260,7 +267,11 @@ bool AudioToolboxMIDIDevice::Preprocess(MIDIStreamer* song, bool looping)
return false; return false;
} }
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
AT_MIDI_CHECK_ERROR(MusicSequenceLoadSMFDataWithFlags(m_sequence, data, 0), false);
#else // 10.5 and above
AT_MIDI_CHECK_ERROR(MusicSequenceFileLoadData(m_sequence, data, kMusicSequenceFile_MIDIType, 0), CFRelease(data), false); AT_MIDI_CHECK_ERROR(MusicSequenceFileLoadData(m_sequence, data, kMusicSequenceFile_MIDIType, 0), CFRelease(data), false);
#endif // prior to 10.5
CFRelease(data); CFRelease(data);

9
src/stats.h
View File

@ -130,6 +130,15 @@ inline unsigned long long rdtsc()
unsigned long long tsc; unsigned long long tsc;
asm volatile ("rdtsc; shlq $32, %%rdx; orq %%rdx, %%rax" : "=a" (tsc) :: "%rdx"); asm volatile ("rdtsc; shlq $32, %%rdx; orq %%rdx, %%rax" : "=a" (tsc) :: "%rdx");
return tsc; return tsc;
#elif defined __ppc__
unsigned int lower, upper, temp;
do
{
asm volatile ("mftbu %0 \n mftb %1 \n mftbu %2 \n"
: "=r"(upper), "=r"(lower), "=r"(temp));
}
while (upper != temp);
return (static_cast<unsigned long long>(upper) << 32) | lower;
#else // i386 #else // i386
if (CPU.bRDTSC) if (CPU.bRDTSC)
{ {