Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Don't include <math.h> when HAVE_MATH_H isn't defined
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Oct 12, 2008
1 parent de62535 commit 7f814ee
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
32 changes: 32 additions & 0 deletions XCodeiPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
View file
Expand Up @@ -720,6 +720,7 @@
"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
PRODUCT_NAME = Rectangles;
};
Expand All @@ -738,6 +739,7 @@
"\"$(SRCROOT)/../SDLiPod/build/Release-iphoneos\"",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDLiPod/build/Debug-iphonesimulator\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
PRODUCT_NAME = Rectangles;
};
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -891,6 +909,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\\\\\\\"$(SRCROOT)\\\\\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand Down Expand Up @@ -919,6 +938,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\\\\\\\"$(SRCROOT)\\\\\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -997,6 +1025,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\\\"$(SRCROOT)\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand Down Expand Up @@ -1025,6 +1054,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\\\"$(SRCROOT)\\\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand Down Expand Up @@ -1054,6 +1084,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand Down Expand Up @@ -1082,6 +1113,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../SDL/build/Debug-iphoneos\"",
);
OTHER_LDFLAGS = (
"-framework",
Expand Down
3 changes: 0 additions & 3 deletions src/audio/SDL_audiocvt.c
View file
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/libm/math.h
View file
Expand Up @@ -22,6 +22,7 @@
#include "SDL_config.h"

#ifdef HAVE_MATH_H
#define _USE_MATH_DEFINES
#include <math.h>
#else

Expand Down

0 comments on commit 7f814ee

Please sign in to comment.