From d94c8037e0133a50200b2630658194e3347de738 Mon Sep 17 00:00:00 2001 From: squall-leonhart Date: Tue, 20 Nov 2012 08:58:44 +0000 Subject: [PATCH] OSX/Mac buildfix changes to GBALink git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1149 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/gba/GBALink.cpp | 8 +++++++- src/win32/XAudio2.cpp | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gba/GBALink.cpp b/src/gba/GBALink.cpp index 4f650fe0..3c78d8d9 100644 --- a/src/gba/GBALink.cpp +++ b/src/gba/GBALink.cpp @@ -1,9 +1,15 @@ // This file was written by denopqrihg // with major changes by tjm #include -#include #include +// malloc.h does not seem to exist on Mac OS 10.7 +#ifdef __APPLE__ +#include +#else +#include +#endif + int vbaid = 0; const char *MakeInstanceFilename(const char *Input) { diff --git a/src/win32/XAudio2.cpp b/src/win32/XAudio2.cpp index ffd48849..0541d7fd 100644 --- a/src/win32/XAudio2.cpp +++ b/src/win32/XAudio2.cpp @@ -287,9 +287,9 @@ bool XAudio2_Output::init(long sampleRate) // Initialize XAudio2 UINT32 flags = 0; -#ifdef _DEBUG - flags = XAUDIO2_DEBUG_ENGINE; -#endif +//#ifdef _DEBUG +// flags = XAUDIO2_DEBUG_ENGINE; +//#endif hr = XAudio2Create( &xaud, flags ); if( hr != S_OK ) {