summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/AppHdr.h
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-09-20 16:00:24 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-09-23 11:34:36 -0700
commit4f63d90dfa282973d47eaff84e76139b5b12042b (patch)
tree3731cbc1bea3a0394deafc944ccf4fa4da7c0e2c /crawl-ref/source/AppHdr.h
parent53187e6f7e98f80c1617ec203de1671be445f485 (diff)
downloadcrawl-ref-4f63d90dfa282973d47eaff84e76139b5b12042b.tar.gz
crawl-ref-4f63d90dfa282973d47eaff84e76139b5b12042b.zip
Xcode: Mac OS X build fixed
I was originally going to split this up into multiple patches, but the Xcode project file format is a bit difficult to cleanly split for patching. So anyway, I've made a few changes: - Fixed Xcode 3.2 compatibility (complaints about using GCC 4.2 with the Mac OS X 10.4 SDK, among other things). - Removed the tilegen target (this is now done via a script) - Fixed the Crawl-tiles-cmd target + Now links to AppKit.framework and OpenGL.framework + Set the search path for the SDL, SDL_image and libpng frameworks to be /Library/Frameworks, which is standard. - Fixed the Crawl target + Now copies the necessary non-standard frameworks to the Frameworks directory (this eliminates the dependency on Fink). + Eliminated a couple redundant or worthless steps which did things we really didn't need. - Added precompiled header support to the Crawl-cmd and Crawl-tiles-cmd targets. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/AppHdr.h')
-rw-r--r--crawl-ref/source/AppHdr.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index 840480b808..50a3dc0eda 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -308,8 +308,10 @@
#ifdef USE_TILE
+ #ifdef __cplusplus
#include "libgui.h"
#include "tilesdl.h"
+ #endif
#endif
// =========================================================================
@@ -463,6 +465,8 @@
// #define NEED_USLEEP
// #define NEED_SNPRINTF
+#ifdef __cplusplus
+
// Must include libutil.h here if one of the above is defined.
#include "libutil.h"
@@ -476,3 +480,5 @@ inline void UNUSED(const volatile T &)
#include "version.h"
#endif
+
+#endif