From e6759cfa4fad87fb8a7e006a32a3d7b57b8e16e7 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@google.com>
Date: Thu, 27 Apr 2017 12:07:31 -0700
Subject: [PATCH] TinyAudio fixes for OSX etc.

---
 examples/ExampleBrowser/premake4.lua | 2 +-
 examples/TinyAudio/b3ReadWavFile.cpp | 3 ++-
 examples/TinyAudio/b3ReadWavFile.h   | 2 +-
 examples/TinyAudio/premake4.lua      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua
index 9b794ce6d..dc1a0b4d1 100644
--- a/examples/ExampleBrowser/premake4.lua
+++ b/examples/ExampleBrowser/premake4.lua
@@ -53,7 +53,7 @@ project "App_BulletExampleBrowser"
 			if os.is("MacOSX") then
 				links{"Cocoa.framework"}
 				links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
-				defines {"__OS_MACOSX__"}
+				defines {"__OS_MACOSX__","__MACOSX_CORE__"}
 			end
 		end
 					
diff --git a/examples/TinyAudio/b3ReadWavFile.cpp b/examples/TinyAudio/b3ReadWavFile.cpp
index e07bc81cb..c5e9ff14a 100644
--- a/examples/TinyAudio/b3ReadWavFile.cpp
+++ b/examples/TinyAudio/b3ReadWavFile.cpp
@@ -16,6 +16,7 @@ const unsigned long B3_FLOAT64 = 0x20;
 
 b3ReadWavFile::b3ReadWavFile()
 {
+	fd_ = 0;
 	m_machineIsLittleEndian = b3MachineIsLittleEndian();
 }
 b3ReadWavFile::~b3ReadWavFile()
@@ -488,4 +489,4 @@ bool b3ReadWavFile::read(unsigned long startFrame, bool doNormalize)
 	// error:
 	//  oStream_ << "FileRead: Error reading file data.";
 	//  handleError( StkError::FILE_ERROR);
-}
\ No newline at end of file
+}
diff --git a/examples/TinyAudio/b3ReadWavFile.h b/examples/TinyAudio/b3ReadWavFile.h
index a89656acf..fb77dafb9 100644
--- a/examples/TinyAudio/b3ReadWavFile.h
+++ b/examples/TinyAudio/b3ReadWavFile.h
@@ -23,7 +23,7 @@ class b3ReadWavFile
 	unsigned long m_numFrames;
 	unsigned long dataType_;
 	double fileDataRate_;
-	FILE *fd_ = 0;
+	FILE *fd_;
 	unsigned long dataOffset_;
 	unsigned int channels_;
 	bool m_machineIsLittleEndian;
diff --git a/examples/TinyAudio/premake4.lua b/examples/TinyAudio/premake4.lua
index 4953d01f3..7b2dc043c 100644
--- a/examples/TinyAudio/premake4.lua
+++ b/examples/TinyAudio/premake4.lua
@@ -36,6 +36,6 @@ if os.is("MacOSX") then
 	links{"Cocoa.framework"}
 	links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
 
-	defines {"__OS_MACOSX__"}
+	defines {"__OS_MACOSX__", "__MACOSX_CORE__"}
 end