From 7f814eea8df4eb36f2fca8808c1853aae138a3a2 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 12 Oct 2008 16:21:36 +0000
Subject: [PATCH] Don't include <math.h> when HAVE_MATH_H isn't defined

---
 .../DemosiPhoneOS.xcodeproj/project.pbxproj   | 32 +++++++++++++++++++
 src/audio/SDL_audiocvt.c                      |  3 --
 src/libm/math.h                               |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj b/XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
index 98f088899..3ac037c3d 100755
--- a/XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
+++ b/XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
@@ -720,6 +720,7 @@
 					"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
 					"\"$(SRCROOT)\"",
 					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				PRODUCT_NAME = Rectangles;
 			};
@@ -738,6 +739,7 @@
 					"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
 					"\"$(SRCROOT)\"",
 					"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				PRODUCT_NAME = Rectangles;
 			};
@@ -791,6 +793,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -814,6 +820,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -839,6 +849,10 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -863,6 +877,10 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -891,6 +909,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\\\\\"$(SRCROOT)\\\\\\\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -919,6 +938,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\\\\\"$(SRCROOT)\\\\\\\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -945,6 +965,10 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -969,6 +993,10 @@
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
+				);
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -997,6 +1025,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\"$(SRCROOT)\\\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1025,6 +1054,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\"$(SRCROOT)\\\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1054,6 +1084,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1082,6 +1113,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
+					"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c
index 324512b04..2e7a13ae9 100644
--- a/src/audio/SDL_audiocvt.c
+++ b/src/audio/SDL_audiocvt.c
@@ -21,9 +21,6 @@
 */
 #include "SDL_config.h"
 
-#define _USE_MATH_DEFINES
-#include <math.h>
-
 /* Functions for audio drivers to perform runtime conversion of audio format */
 
 #include "SDL_audio.h"
diff --git a/src/libm/math.h b/src/libm/math.h
index 6f0006d57..a10b833cb 100644
--- a/src/libm/math.h
+++ b/src/libm/math.h
@@ -22,6 +22,7 @@
 #include "SDL_config.h"
 
 #ifdef HAVE_MATH_H
+#define _USE_MATH_DEFINES
 #include <math.h>
 #else