ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OSX/Mac buildfix changes to GBALink

This commit is contained in:
squall-leonhart 2012-11-20 08:58:44 +00:00
parent f3956ff5b5
commit d10e657c36
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gba/GBALink.cpp
View File

@ -1,9 +1,15 @@
// This file was written by denopqrihg // This file was written by denopqrihg
// with major changes by tjm // with major changes by tjm
#include <string.h> #include <string.h>
#include <malloc.h>
#include <stdio.h> #include <stdio.h>
// malloc.h does not seem to exist on Mac OS 10.7
#ifdef __APPLE__
#include <stdlib.h>
#else
#include <malloc.h>
#endif
int vbaid = 0; int vbaid = 0;
const char *MakeInstanceFilename(const char *Input) const char *MakeInstanceFilename(const char *Input)
{ {

6
src/win32/XAudio2.cpp
View File

@ -287,9 +287,9 @@ bool XAudio2_Output::init(long sampleRate)
// Initialize XAudio2 // Initialize XAudio2
UINT32 flags = 0; UINT32 flags = 0;
#ifdef _DEBUG //#ifdef _DEBUG
flags = XAUDIO2_DEBUG_ENGINE; // flags = XAUDIO2_DEBUG_ENGINE;
#endif //#endif
hr = XAudio2Create( &xaud, flags ); hr = XAudio2Create( &xaud, flags );
if( hr != S_OK ) { if( hr != S_OK ) {