Skip to content

L
libSDL
Commit a3c6362a authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Don't include <math.h> when HAVE_MATH_H isn't defined 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403225
parent 55650e43
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 3 deletions
XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
View file @ a3c6362a
...@@ -720,6 +720,7 @@ ...@@ -720,6 +720,7 @@
"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"", "\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"", "\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
PRODUCT_NAME = Rectangles; PRODUCT_NAME = Rectangles;
}; };
...@@ -738,6 +739,7 @@ ...@@ -738,6 +739,7 @@
"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"", "\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"", "\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
PRODUCT_NAME = Rectangles; PRODUCT_NAME = Rectangles;
}; };
...@@ -791,6 +793,10 @@ ...@@ -791,6 +793,10 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -814,6 +820,10 @@ ...@@ -814,6 +820,10 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -839,6 +849,10 @@ ...@@ -839,6 +849,10 @@
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -863,6 +877,10 @@ ...@@ -863,6 +877,10 @@
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -891,6 +909,7 @@ ...@@ -891,6 +909,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\\\\\\\"$(SRCROOT)\\\\\\\"", "\\\\\\\"$(SRCROOT)\\\\\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
...@@ -919,6 +938,7 @@ ...@@ -919,6 +938,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\\\\\\\"$(SRCROOT)\\\\\\\"", "\\\\\\\"$(SRCROOT)\\\\\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
...@@ -945,6 +965,10 @@ ...@@ -945,6 +965,10 @@
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -969,6 +993,10 @@ ...@@ -969,6 +993,10 @@
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications"; INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
Foundation, Foundation,
...@@ -997,6 +1025,7 @@ ...@@ -997,6 +1025,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\\\"$(SRCROOT)\\\"", "\\\"$(SRCROOT)\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
...@@ -1025,6 +1054,7 @@ ...@@ -1025,6 +1054,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\\\"$(SRCROOT)\\\"", "\\\"$(SRCROOT)\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
...@@ -1054,6 +1084,7 @@ ...@@ -1054,6 +1084,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
...@@ -1082,6 +1113,7 @@ ...@@ -1082,6 +1113,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
); );
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-framework", "-framework",
......
src/audio/SDL_audiocvt.c
View file @ a3c6362a
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#define _USE_MATH_DEFINES
#include <math.h>
/* Functions for audio drivers to perform runtime conversion of audio format */ /* Functions for audio drivers to perform runtime conversion of audio format */
#include "SDL_audio.h" #include "SDL_audio.h"
......
src/libm/math.h
View file @ a3c6362a
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "SDL_config.h" #include "SDL_config.h"
#ifdef HAVE_MATH_H #ifdef HAVE_MATH_H
#define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment