apple build issue

This commit is contained in:
David Rose 2009-10-22 20:33:04 +00:00
parent df9edbe1dd
commit eaee7a00f8

View File

@ -12,6 +12,15 @@
//
////////////////////////////////////////////////////////////////////
#ifdef __APPLE__
// We have to include this before we include any Panda libraries,
// because one of the things we pick up in Panda defines a macro for
// TCP_NODELAY and friends, causing heartaches for the header files
// picked up here.
#include <Carbon/Carbon.h>
extern "C" { void CPSEnableForegroundOperation(ProcessSerialNumber* psn); }
#endif
#include "showBase.h"
#include "throw_event.h"
@ -20,11 +29,6 @@
#include "camera.h"
#include "graphicsPipeSelection.h"
#ifdef __APPLE__
#include <Carbon/Carbon.h>
extern "C" { void CPSEnableForegroundOperation(ProcessSerialNumber* psn); }
#endif
#ifdef WIN32
#include <windows.h> // For SystemParametersInfo()
STICKYKEYS g_StartupStickyKeys = {sizeof(STICKYKEYS), 0};