summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-07 03:04:31 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-07 03:04:31 +0300
commit07c9bb103823dd9c0dc297d0315907ab94488f93 (patch)
tree53b894b927c37c8a6e8779225861861656b033ac /solenv
parentd0d2c12a54e590496af9d0df278c863365293ae0 (diff)
Drop workarounds for Mac OS X SDKs 10.4 and 10.5
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk1
-rw-r--r--solenv/inc/premac.h15
2 files changed, 0 insertions, 16 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4eabc920e021..970d6bdc26e8 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -88,7 +88,6 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
gb_LinkTarget_LDFLAGS := \
- $(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \
$(SOLARLIB) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index f4993f99e46a..f6e37475795f 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -47,19 +47,4 @@
#define StringPtr MacOSStringPtr
#define TimeValue MacOSTimeValue
-#ifdef __OBJC__
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-@class CALayer;
-@class NSViewController;
-typedef int NSColorRenderingIntent;
-#endif
-#endif
-
-#if defined(MACOSX_SDK_VERSION) && MACOSX_SDK_VERSION < 1050
-typedef float CGFloat;
-typedef int NSInteger;
-typedef unsigned NSUInteger;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */