From c953eca82b541cd27e9388a42ce43055dbdbc523 Mon Sep 17 00:00:00 2001 From: Roger Hughston Date: Fri, 10 Feb 2006 19:54:19 +0000 Subject: [PATCH] Some more motion on osx --- dtool/Config.osx.pp | 148 ++++++++++++++++++++++++++++++++++++++++++++ dtool/Config.pp | 2 + dtool/LocalSetup.pp | 5 ++ 3 files changed, 155 insertions(+) create mode 100644 dtool/Config.osx.pp diff --git a/dtool/Config.osx.pp b/dtool/Config.osx.pp new file mode 100644 index 0000000000..d79e336efb --- /dev/null +++ b/dtool/Config.osx.pp @@ -0,0 +1,148 @@ +// +// Config.osx.pp +// +// This file defines some custom config variables for the osx +// platform. It makes some initial guesses about compiler features, +// etc. +// + +// What additional flags should we pass to interrogate? +#define SYSTEM_IGATE_FLAGS -D__i386__ -D__const=const + +#define IS_OSX 1 + +// Is the platform big-endian (like an SGI workstation) or +// little-endian (like a PC)? Define this to the empty string to +// indicate little-endian, or nonempty to indicate big-endian. +#define WORDS_BIGENDIAN 1 + +// Does the C++ compiler support namespaces? +#define HAVE_NAMESPACE 1 + +// Does the C++ compiler support ios::binary? +#define HAVE_IOS_BINARY 1 + +// How about the typename keyword? +#define HAVE_TYPENAME 1 + +// Will the compiler avoid inserting extra bytes in structs between a +// base struct and its derived structs? It is safe to define this +// false if you don't know, but if you know that you can get away with +// this you may gain a tiny performance gain by defining this true. +// If you define this true incorrectly, you will get lots of +// assertion failures on execution. +#define SIMPLE_STRUCT_POINTERS + +// Do we have a gettimeofday() function? +#define HAVE_GETTIMEOFDAY 1 + +// Does gettimeofday() take only one parameter? +#define GETTIMEOFDAY_ONE_PARAM + +// Do we have getopt() and/or getopt_long_only() built into the +// system? +#define HAVE_GETOPT 1 +#define HAVE_GETOPT_LONG_ONLY + +// Are the above getopt() functions defined in getopt.h, or somewhere else? +#define HAVE_GETOPT_H 1 + +// Can we determine the terminal width by making an ioctl(TIOCGWINSZ) call? +#define IOCTL_TERMINAL_WIDTH 1 + +// Do the system headers define a "streamsize" typedef? How about the +// ios::binary enumerated value? And other ios typedef symbols like +// ios::openmode and ios::fmtflags? +#define HAVE_STREAMSIZE 1 +#define HAVE_IOS_BINARY 1 +#define HAVE_IOS_TYPEDEFS 1 + +// Can we safely call getenv() at static init time? +#define STATIC_INIT_GETENV 1 + +// Can we read the file /proc/self/environ to determine our +// environment variables at static init time? +#define HAVE_PROC_SELF_ENVIRON 1 + +// Do we have a global pair of argc/argv variables that we can read at +// static init time? Should we prototype them? What are they called? +#define HAVE_GLOBAL_ARGV +#define PROTOTYPE_GLOBAL_ARGV +#define GLOBAL_ARGV +#define GLOBAL_ARGC + +// Can we read the file /proc/self/cmdline to determine our +// command-line arguments at static init time? +#define HAVE_PROC_SELF_CMDLINE 1 + +// Should we include or ? Define HAVE_IOSTREAM +// to nonempty if we should use , or empty if we should use +// . +#define HAVE_IOSTREAM 1 + +// Do we have a true stringstream class defined in ? +#define HAVE_SSTREAM 1 + +// Does fstream::open() require a third parameter, specifying the +// umask? Versions of gcc prior to 3.2 had this. +#define HAVE_OPEN_MASK + +// Do the compiler or system libraries define wchar_t for you? +#define HAVE_WCHAR_T 1 + +// Does define the typedef wstring? Most do, but for some +// reason, versions of gcc before 3.0 didn't do this. +#define HAVE_WSTRING 1 + +// Do we have ? +#define HAVE_NEW 1 + +// Do we have ? +#define HAVE_IO_H + +// Do we have ? +#define HAVE_MALLOC_H 1 + +// Do we have ? +#define HAVE_ALLOCA_H 1 + +// Do we have ? +#define HAVE_LOCALE_H 1 + +// Do we have ? +#define HAVE_MINMAX_H + +// Do we have ? +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_TIME_H 1 + +// Do we have ? +#define HAVE_UNISTD_H 1 + +// Do we have ? +#define HAVE_UTIME_H 1 + +// Do we have ? +#define HAVE_DIRENT_H 1 + +// Do we have (and do we want to use it instead of dirent.h)? +#define HAVE_GLOB_H 1 + +// Do we have (and presumably a Linux-style audio +// interface)? +#define HAVE_SYS_SOUNDCARD_H 1 + +// Do we have RTTI (and )? +#define HAVE_RTTI 1 + +// Must global operator new and delete functions throw exceptions? +#define GLOBAL_OPERATOR_NEW_EXCEPTIONS 1 + +// What is the syntax of the STL allocator declaration? See +// LocalSetup.pp for allowable values. +#define STL_ALLOCATOR MODERN + +// The dynamic library file extension (usually .so .dll or .dylib): +#define DYNAMIC_LIB_EXT .dylib + + diff --git a/dtool/Config.pp b/dtool/Config.pp index a07d368dee..034826ce07 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -485,6 +485,7 @@ #defer GL_IPATH #defer GL_LPATH #defer GL_FRAMEWORK OpenGL + #defer GL_LIBS GL GLU #else #defer GL_IPATH #defer GL_LPATH /usr/X11R6/lib @@ -716,6 +717,7 @@ // BOUNDS (BoundsChecker) // INTEL (Intel C/C++ compiler) +#define USE_COMPILER GCC #if $[WINDOWS_PLATFORM] #if $[eq $[USE_COMPILER],] #define USE_COMPILER MSVC7 diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 80eba1a405..8dd673ec43 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -522,4 +522,9 @@ $[cdefine VC6_STYLE_ALLOCATOR] $[cdefine MODERN_STYLE_ALLOCATOR] $[cdefine NO_STYLE_ALLOCATOR] + + +$[cdefine IS_OSX] + + #end dtool_config.h