Don't include <math.h> when HAVE_MATH_H isn't defined
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403225
This commit is contained in:
parent
55650e4354
commit
a3c6362a20
3 changed files with 33 additions and 3 deletions
|
@ -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 @@
|
||||||
"\"$(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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
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 @@
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"\"$(SRCROOT)\"",
|
"\"$(SRCROOT)\"",
|
||||||
|
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue