RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

safe iphone build

This commit is contained in:
David Rose 2009-04-24 22:53:28 +00:00
parent 45dddf3661
commit 8a44eb5b92
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/tinydisplay/Sources.pp
View File

@ -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

4
panda/src/tinydisplay/config_tinydisplay.cxx
View File

@ -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

2
panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx
View File

@ -14,7 +14,7 @@
#include "pandabase.h"
#ifdef IS_OSX
#if defined(IS_OSX) && !defined(BUILD_IPHONE)
#include "tinyOsxGraphicsPipe.h"
#include "config_tinydisplay.h"

2
panda/src/tinydisplay/tinyOsxGraphicsPipe.h
View File

@ -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

2
panda/src/tinydisplay/tinyOsxGraphicsWindow.h
View File

@ -17,7 +17,7 @@
#include "pandabase.h"
#ifdef IS_OSX
#if defined(IS_OSX) && !defined(BUILD_IPHONE)
#include <Carbon/Carbon.h>

7
panda/src/tinydisplay/tinyOsxGraphicsWindow.mm
View File

@ -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