From 8a44eb5b920eca61d67acb414f9bb60c7e72b0f3 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 24 Apr 2009 22:53:28 +0000
Subject: [PATCH] safe iphone build

---
 panda/src/tinydisplay/Sources.pp               | 2 +-
 panda/src/tinydisplay/config_tinydisplay.cxx   | 4 ++--
 panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx  | 2 +-
 panda/src/tinydisplay/tinyOsxGraphicsPipe.h    | 2 +-
 panda/src/tinydisplay/tinyOsxGraphicsWindow.h  | 2 +-
 panda/src/tinydisplay/tinyOsxGraphicsWindow.mm | 7 +++++++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/panda/src/tinydisplay/Sources.pp b/panda/src/tinydisplay/Sources.pp
index 8b5de454b4..5116f157da 100644
--- a/panda/src/tinydisplay/Sources.pp
+++ b/panda/src/tinydisplay/Sources.pp
@@ -1,7 +1,7 @@
 #define BUILD_DIRECTORY $[HAVE_TINYDISPLAY]
 #define BUILDING_DLL BUILDING_TINYDISPLAY
 
-#define OSX_SYS_FRAMEWORKS ApplicationServices Carbon CoreServices Cocoa  
+#define OSX_SYS_FRAMEWORKS $[if $[not $[BUILD_IPHONE]],ApplicationServices Carbon CoreServices Cocoa ]
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m prc:c 
 
diff --git a/panda/src/tinydisplay/config_tinydisplay.cxx b/panda/src/tinydisplay/config_tinydisplay.cxx
index 5c60ad8607..f76534a445 100644
--- a/panda/src/tinydisplay/config_tinydisplay.cxx
+++ b/panda/src/tinydisplay/config_tinydisplay.cxx
@@ -151,7 +151,7 @@ init_libtinydisplay() {
   ps->set_system_tag("TinyPanda", "native_window_system", "Win");
 #endif
 
-#ifdef IS_OSX
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
   TinyOsxGraphicsPipe::init_type();
   TinyOsxGraphicsWindow::init_type();
   selection->add_pipe_type(TinyOsxGraphicsPipe::get_class_type(),
@@ -185,7 +185,7 @@ get_pipe_type_tinydisplay() {
   return TinyWinGraphicsPipe::get_class_type().get_index();
 #endif
 
-#ifdef IS_OSX
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
   return TinyOsxGraphicsPipe::get_class_type().get_index();
 #endif
 
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
index 76661589c9..8212da6518 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
@@ -14,7 +14,7 @@
 
 #include "pandabase.h"
 
-#ifdef IS_OSX
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
 
 #include "tinyOsxGraphicsPipe.h"
 #include "config_tinydisplay.h"
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
index 3476d8bcb5..9b5e090ce9 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h
@@ -17,7 +17,7 @@
 
 #include "pandabase.h"
 
-#ifdef IS_OSX
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
 
 // We have to include this early, before anyone includes
 // netinet/tcp.h, which will define TCP_NODELAY and other symbols and
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.h b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
index ee1849eccf..2d58b4b196 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h
@@ -17,7 +17,7 @@
 
 #include "pandabase.h"
 
-#ifdef IS_OSX
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
 
 #include <Carbon/Carbon.h>
 
diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm
index 1658a50948..336ecc8ff0 100644
--- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm
+++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm
@@ -8,6 +8,11 @@
 // with this source code in a file named "LICENSE."
 //
 ////////////////////////////////////////////////////////////////////
+
+#include "pandabase.h"
+
+#if defined(IS_OSX) && !defined(BUILD_IPHONE)
+
 #include <Carbon/Carbon.h>
 #include <Cocoa/Cocoa.h>
 
@@ -1791,3 +1796,5 @@ create_frame_buffer() {
 
   _frame_buffer = ZB_open(_properties.get_x_size(), _properties.get_y_size(), ZB_MODE_RGBA, 0, 0, 0, 0);
 }
+
+#endif  // IS_OSX