summaryrefslogtreecommitdiff
path: root/sysdata_darwin.m
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-05-20 07:46:57 -0400
committerPietro Gagliardi <[email protected]>2014-05-20 07:46:57 -0400
commit3e9e767d79c85726741faee7b025412a27a6f86c (patch)
tree7e19fc91230417547dab19a949dd82d08d2a0104 /sysdata_darwin.m
parent5f5f4f6c2adde30e1f15ff46b209c7e4312630f8 (diff)
Fixed the Mac OS X 10.6 building using a rather hackish approach... Now it won't build on 10.6 itself without problems, so...
Diffstat (limited to 'sysdata_darwin.m')
-rw-r--r--sysdata_darwin.m19
1 files changed, 18 insertions, 1 deletions
diff --git a/sysdata_darwin.m b/sysdata_darwin.m
index c0d5cab..ded1d3c 100644
--- a/sysdata_darwin.m
+++ b/sysdata_darwin.m
@@ -2,10 +2,27 @@
#include "objc_darwin.h"
#include <Foundation/NSGeometry.h>
+
+// see delegateuitask_darwin.m
+// in this case, lots of headers include NSApplication.h
+// NOTE uncomment the ones below when resolved because yay inconsistent include guard madness
+#include <AppKit/NSView.h>
+#include <AppKit/NSControl.h>
+
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MAX_ALLOWED
+#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_7
+#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7
+#include <AppKit/NSApplication.h>
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
+#undef MAC_OS_X_VERSION_MAX_ALLOWED
+#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_6
+
#include <AppKit/NSWindow.h>
#include <AppKit/NSView.h>
#include <AppKit/NSFont.h>
-#include <AppKit/NSControl.h>
+//#include <AppKit/NSControl.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSPopUpButton.h>
#include <AppKit/NSComboBox.h>