TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-20 22:20:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

OSX big Commit ...

Browse Source
This commit is contained in:
Roger Hughston 2006-03-17 22:55:08 +00:00
parent fc7fc09140
commit 42b3ba9c82
28 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dtool/Config.osx.pp
View File

@ -8,13 +8,13 @@
//#define PYTHON_IPATH /Library/Frameworks/Python.framework/Headers //#define PYTHON_IPATH /Library/Frameworks/Python.framework/Headers
//#define PYTHON_LPATH /Library/Frameworks/Python.framework/Headers //#define PYTHON_LPATH /Library/Frameworks/Python.framework/Headers
#define PYTHON_IPATH /System/Library/Frameworks/Python.framework/Headers #define PYTHON_IPATH /Library/Frameworks/Python.framework/Headers
#define HAVE_PYTHON 1 #define HAVE_PYTHON 1
#define PYTHON_FRAMEWORK Python #define PYTHON_FRAMEWORK Python
// What additional flags should we pass to interrogate? // What additional flags should we pass to interrogate?
#define SYSTEM_IGATE_FLAGS -D__ppc__ -D__const=const -Dvolatile -D__BIG_ENDIAN__ -D__inline__=inline #define SYSTEM_IGATE_FLAGS -D__ppc__ -D__const=const -Dvolatile -D__BIG_ENDIAN__ -D__inline__=inline -D__GNUC__
#define HAVE_GL 1 #define HAVE_GL 1
#define IS_OSX 1 #define IS_OSX 1
@ -43,6 +43,9 @@
//#define HAVE_FFTW 1 //#define HAVE_FFTW 1
#define TIFF_IPATH /opt/local/include
#define TIFF_LPATH /opt/local/lib
// Is the platform big-endian (like an SGI workstation) or // Is the platform big-endian (like an SGI workstation) or
// little-endian (like a PC)? Define this to the empty string to // little-endian (like a PC)? Define this to the empty string to
// indicate little-endian, or nonempty to indicate big-endian. // indicate little-endian, or nonempty to indicate big-endian.
@ -100,12 +103,12 @@
// static init time? Should we prototype them? What are they called? // static init time? Should we prototype them? What are they called?
#define HAVE_GLOBAL_ARGV #define HAVE_GLOBAL_ARGV
#define PROTOTYPE_GLOBAL_ARGV #define PROTOTYPE_GLOBAL_ARGV
#define GLOBAL_ARGV #define GLOBAL_ARGV __Argv
#define GLOBAL_ARGC #define GLOBAL_ARGC __Argc
// Can we read the file /proc/self/cmdline to determine our // Can we read the file /proc/self/cmdline to determine our
// command-line arguments at static init time? // command-line arguments at static init time?
#define HAVE_PROC_SELF_CMDLINE 1 #define HAVE_PROC_SELF_CMDLINE
// Should we include <iostream> or <iostream.h>? Define HAVE_IOSTREAM // Should we include <iostream> or <iostream.h>? Define HAVE_IOSTREAM
// to nonempty if we should use <iostream>, or empty if we should use // to nonempty if we should use <iostream>, or empty if we should use

15
dtool/Config.pp
View File

@ -476,17 +476,14 @@
// Is OpenGL installed, and where? This should include libGL as well // Is OpenGL installed, and where? This should include libGL as well
// as libGLU, if they are in different places. // as libGLU, if they are in different places.
#if $[WINDOWS_PLATFORM]
#defer GL_IPATH #defer GL_IPATH
#defer GL_LPATH #defer GL_LPATH
#defer GL_LIBS
#if $[WINDOWS_PLATFORM]
#define GL_LIBS opengl32.lib glu32.lib #define GL_LIBS opengl32.lib glu32.lib
#elif $[OSX_PLATFORM] #elif $[OSX_PLATFORM]
#defer GL_IPATH
#defer GL_LPATH /System/Library/Frameworks/OpenGL.framework/Libraries/
#defer GL_FRAMEWORK OpenGL #defer GL_FRAMEWORK OpenGL
#defer GL_LIBS GL GLU
#else #else
#defer GL_IPATH
#defer GL_LPATH /usr/X11R6/lib #defer GL_LPATH /usr/X11R6/lib
#defer GL_LIBS GL GLU #defer GL_LIBS GL GLU
#endif #endif
@ -843,12 +840,12 @@
// list of dependent libraries, and $[lpath] is a space-separated list // list of dependent libraries, and $[lpath] is a space-separated list
// of directories in which those libraries can be found. // of directories in which those libraries can be found.
#defer LINK_BIN_C $[cc_ld] -o $[target] $[sources] $[flags] $[lpath:%=-L%] $[libs:%=-l%]\ #defer LINK_BIN_C $[cc_ld] -o $[target] $[sources] $[flags] $[lpath:%=-L%] $[libs:%=-l%]\
$[fpath:%=-Wl,-F%] $[patsubst %,-framework %, $[frameworks]] $[fpath:%=-Wl,-F%] $[patsubst %,-framework %, $[bin_frameworks]]
#defer LINK_BIN_C++ $[cxx_ld]\ #defer LINK_BIN_C++ $[cxx_ld]\
-o $[target] $[sources]\ -o $[target] $[sources]\
$[flags]\ $[flags]\
$[lpath:%=-L%] $[libs:%=-l%]\ $[lpath:%=-L%] $[libs:%=-l%]\
$[fpath:%=-Wl,-F%] $[patsubst %,-framework %, $[frameworks]] $[fpath:%=-Wl,-F%] $[patsubst %,-framework %, $[bin_frameworks]]
// How to generate a static C or C++ library. $[target] is the // How to generate a static C or C++ library. $[target] is the
// name of the library to generate, and $[sources] is the list of .o // name of the library to generate, and $[sources] is the list of .o
@ -880,8 +877,8 @@
// which those libraries can be found. // which those libraries can be found.
#if $[eq $[PLATFORM], osx] #if $[eq $[PLATFORM], osx]
#defer SHARED_LIB_C $[cc_ld] -o $[target] -install_name $[notdir $[target]] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]] #defer SHARED_LIB_C $[cc_ld] -o $[target] -install_name $[notdir $[target]] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]]
#defer SHARED_LIB_C++ $[cxx_ld] -dynamic -dynamiclib -o $[target] -install_name $[notdir $[target]] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]] #defer SHARED_LIB_C++ $[cxx_ld] -undefined dynamic_lookup -dynamic -dynamiclib -o $[target] -install_name $[notdir $[target]] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]]
#defer BUNDLE_LIB_C++ $[cxx_ld] -bundle -o $[target] -install_name $[notdir $[target]] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]] #defer BUNDLE_LIB_C++ $[cxx_ld] -undefined dynamic_lookup -bundle -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%] $[patsubst %,-framework %, $[frameworks]]
#else #else
#defer SHARED_LIB_C $[cc_ld] -shared -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%] #defer SHARED_LIB_C $[cc_ld] -shared -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%]
#defer SHARED_LIB_C++ $[cxx_ld] -shared -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%] #defer SHARED_LIB_C++ $[cxx_ld] -shared -o $[target] $[sources] $[lpath:%=-L%] $[libs:%=-l%]

10
dtool/pptempl/Global.pp
View File

@ -475,13 +475,17 @@
// target claims to require. This returns a space-separated set of // target claims to require. This returns a space-separated set of
// framework names only; the -framework switch is not included here. // framework names only; the -framework switch is not included here.
#defun get_frameworks #defun get_frameworks
#define alt_framework $[if $[IGNORE_LIB_DEFAULTS_HACK],,$[stl_framework] $[nspr_framework] $[python_framework]] #define alt_frameworks $[if $[IGNORE_LIB_DEFAULTS_HACK],,$[stl_framework] $[nspr_framework] $[python_framework]]
#if $[OSX_PLATFORM]
#set alt_frameworks $[alt_frameworks] $[OSX_SYS_FRAMEWORKS]
#endif
#foreach package $[use_packages] #foreach package $[use_packages]
#set alt_framework $[alt_framework] $[$[package]_framework] #set alt_frameworks $[alt_frameworks] $[$[package]_framework]
#end package #end package
$[alt_framework] $[alt_frameworks]
#end get_frameworks #end get_frameworks
// This function returns the appropriate set of library names to link // This function returns the appropriate set of library names to link

7
dtool/pptempl/Template.unix.pp
View File

@ -381,6 +381,13 @@ $[install_lib_dir]/lib$[TARGET]$[DYNAMIC_LIB_EXT] : $[ODIR]/lib$[TARGET]$[DYNAMI
#define dest $[install_lib_dir] #define dest $[install_lib_dir]
$[TAB] $[INSTALL] $[TAB] $[INSTALL]
#if $[BUNDLE_EXT]
$[install_lib_dir]/lib$[TARGET]$[BUNDLE_EXT] : $[ODIR]/lib$[TARGET]$[BUNDLE_EXT]
#define local $[ODIR]/lib$[TARGET]$[BUNDLE_EXT]
#define dest $[install_lib_dir]
$[TAB] $[INSTALL]
#endif // BUNDLE_EXT
#if $[igatescan] #if $[igatescan]
// Now, some additional rules to generate and compile the interrogate // Now, some additional rules to generate and compile the interrogate
// data, if needed. // data, if needed.

11
dtool/src/dtoolutil/load_dso.cxx
View File

@ -115,16 +115,10 @@ load_dso_error() {
void * load_dso(const Filename &filename) void * load_dso(const Filename &filename)
{ {
cerr << "_dyld_present() = " << _dyld_present() << endl;
cerr << "_dyld_image_count() = " << _dyld_image_count() << endl;
std::string fname = filename.to_os_specific(); std::string fname = filename.to_os_specific();
printf("----- Trying To Load %s \n",fname.c_str());
void * answer = dlopen(fname.c_str(),RTLD_NOW| RTLD_LOCAL); void * answer = dlopen(fname.c_str(),RTLD_NOW| RTLD_LOCAL);
cerr << "_dyld_present() = " << _dyld_present() << endl; //void * answer = dlopen(fname.c_str(),RTLD_NOW);
cerr << "_dyld_image_count() = " << _dyld_image_count() << endl;
return answer; return answer;
@ -132,7 +126,8 @@ void * load_dso(const Filename &filename)
string string
load_dso_error() { load_dso_error() {
return "No DSO loading yet!"; return std::string(dlerror());
//return "No DSO loading yet!";
} }
#else #else

2
dtool/src/interrogate/functionRemap.cxx
View File

@ -30,7 +30,7 @@
#include "cppParameterList.h" #include "cppParameterList.h"
#include "cppReferenceType.h" #include "cppReferenceType.h"
#include "interrogateType.h" #include "interrogateType.h"
#include "notify.h" #include "pnotify.h"
extern bool inside_python_native; extern bool inside_python_native;

2
dtool/src/interrogate/interfaceMaker.cxx
View File

@ -39,7 +39,7 @@
#include "interrogateElement.h" #include "interrogateElement.h"
#include "cppFunctionType.h" #include "cppFunctionType.h"
#include "cppParameterList.h" #include "cppParameterList.h"
#include "notify.h" #include "pnotify.h"
InterrogateType dummy_type; InterrogateType dummy_type;

2
dtool/src/interrogate/interrogate.cxx
View File

@ -21,7 +21,7 @@
#include "interrogateDatabase.h" #include "interrogateDatabase.h"
#include "cppGlobals.h" #include "cppGlobals.h"
#include "notify.h" #include "pnotify.h"
#include <time.h> #include <time.h>
// If our system getopt() doesn't come with getopt_long_only(), then use // If our system getopt() doesn't come with getopt_long_only(), then use

4
dtool/src/interrogate/interrogateBuilder.cxx
View File

@ -48,7 +48,7 @@
#include "cppTypeDeclaration.h" #include "cppTypeDeclaration.h"
#include "cppEnumType.h" #include "cppEnumType.h"
#include "cppCommentBlock.h" #include "cppCommentBlock.h"
#include "notify.h" #include "pnotify.h"
#include <ctype.h> #include <ctype.h>
#include <algorithm> #include <algorithm>
@ -358,7 +358,7 @@ void InterrogateBuilder::write_code(ostream &out_code,ostream * out_include, Int
ostringstream declaration_bodies; ostringstream declaration_bodies;
if (watch_asserts) { if (watch_asserts) {
declaration_bodies << "#include \"notify.h\"\n"; declaration_bodies << "#include \"pnotify.h\"\n";
} }
declaration_bodies << "#include <sstream>\n"; declaration_bodies << "#include <sstream>\n";

2
dtool/src/interrogate/interrogate_module.cxx
View File

@ -25,7 +25,7 @@
#include "interrogate_request.h" #include "interrogate_request.h"
#include "load_dso.h" #include "load_dso.h"
#include "pystub.h" #include "pystub.h"
#include "notify.h" #include "pnotify.h"
#include "set" #include "set"

2
dtool/src/interrogate/parameterRemapPTToPointer.cxx
View File

@ -24,7 +24,7 @@
#include "cppType.h" #include "cppType.h"
#include "cppStructType.h" #include "cppStructType.h"
#include "cppDeclaration.h" #include "cppDeclaration.h"
#include "notify.h" #include "pnotify.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: ParameterRemapPTToPointer::Constructor // Function: ParameterRemapPTToPointer::Constructor

2
dtool/src/interrogate/typeManager.cxx
View File

@ -28,7 +28,7 @@
#include "cppSimpleType.h" #include "cppSimpleType.h"
#include "cppStructType.h" #include "cppStructType.h"
#include "cppTypeDeclaration.h" #include "cppTypeDeclaration.h"
#include "notify.h" #include "pnotify.h"
#include "cppTypedef.h" #include "cppTypedef.h"
#include "cppEnumType.h" #include "cppEnumType.h"

2
dtool/src/interrogatedb/mutexDummyImpl.h
View File

@ -24,7 +24,7 @@
#ifdef THREAD_DUMMY_IMPL #ifdef THREAD_DUMMY_IMPL
#include "notify.h" #include "pnotify.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : MutexDummyImpl // Class : MutexDummyImpl

2
dtool/src/interrogatedb/mutexNsprImpl.h
View File

@ -24,7 +24,7 @@
#ifdef THREAD_NSPR_IMPL #ifdef THREAD_NSPR_IMPL
#include "notify.h" #include "pnotify.h"
#include <prlock.h> #include <prlock.h>

2
dtool/src/interrogatedb/mutexPosixImpl.h
View File

@ -24,7 +24,7 @@
#ifdef THREAD_POSIX_IMPL #ifdef THREAD_POSIX_IMPL
#include "notify.h" #include "pnotify.h"
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>

2
dtool/src/interrogatedb/mutexWin32Impl.h
View File

@ -24,7 +24,7 @@
#ifdef THREAD_WIN32_IMPL #ifdef THREAD_WIN32_IMPL
#include "notify.h" #include "pnotify.h"
#include <windows.h> #include <windows.h>

2
dtool/src/interrogatedb/typeHandle.h
View File

@ -21,7 +21,7 @@
#include "dtoolbase.h" #include "dtoolbase.h"
#include "typeRegistry.h" #include "typeRegistry.h"
#include "notify.h" #include "pnotify.h"
#include <set> #include <set>

2
dtool/src/interrogatedb/typeRegistry.h
View File

@ -21,7 +21,7 @@
#include "dtoolbase.h" #include "dtoolbase.h"
#include "mutexImpl.h" #include "mutexImpl.h"
#include "notify.h" #include "pnotify.h"
#include "pvector.h" #include "pvector.h"
#include "pmap.h" #include "pmap.h"

4
dtool/src/prc/Sources.pp
View File

@ -25,7 +25,7 @@
configVariableSearchPath.I configVariableSearchPath.h \ configVariableSearchPath.I configVariableSearchPath.h \
configVariableString.I configVariableString.h \ configVariableString.I configVariableString.h \
globPattern.I globPattern.h \ globPattern.I globPattern.h \
notify.I notify.h \ pnotify.I pnotify.h \
notifyCategory.I notifyCategory.h \ notifyCategory.I notifyCategory.h \
notifyCategoryProxy.I notifyCategoryProxy.h \ notifyCategoryProxy.I notifyCategoryProxy.h \
notifySeverity.h \ notifySeverity.h \
@ -74,7 +74,7 @@
configVariableSearchPath.I configVariableSearchPath.h \ configVariableSearchPath.I configVariableSearchPath.h \
configVariableString.I configVariableString.h \ configVariableString.I configVariableString.h \
globPattern.I globPattern.h \ globPattern.I globPattern.h \
notify.I notify.h \ pnotify.I pnotify.h \
notifyCategory.I notifyCategory.h \ notifyCategory.I notifyCategory.h \
notifyCategoryProxy.I notifyCategoryProxy.h \ notifyCategoryProxy.I notifyCategoryProxy.h \
notifySeverity.h \ notifySeverity.h \

2
dtool/src/prc/configPageManager.h
View File

@ -23,7 +23,7 @@
#include "pvector.h" #include "pvector.h"
#include "dSearchPath.h" #include "dSearchPath.h"
#include "globPattern.h" #include "globPattern.h"
#include "notify.h" #include "pnotify.h"
class ConfigPage; class ConfigPage;

2
dtool/src/prc/configVariableCore.cxx
View File

@ -20,7 +20,7 @@
#include "configDeclaration.h" #include "configDeclaration.h"
#include "configPage.h" #include "configPage.h"
#include "pset.h" #include "pset.h"
#include "notify.h" #include "pnotify.h"
#include "config_prc.h" #include "config_prc.h"
#include <algorithm> #include <algorithm>

2
dtool/src/prc/configVariableCore.h
View File

@ -22,7 +22,7 @@
#include "dtoolbase.h" #include "dtoolbase.h"
#include "configFlags.h" #include "configFlags.h"
#include "configPageManager.h" #include "configPageManager.h"
#include "notify.h" #include "pnotify.h"
#include "pvector.h" #include "pvector.h"
#include "pmap.h" #include "pmap.h"

2
dtool/src/prc/configVariableManager.h
View File

@ -21,7 +21,7 @@
#include "dtoolbase.h" #include "dtoolbase.h"
#include "configFlags.h" #include "configFlags.h"
#include "notify.h" #include "pnotify.h"
#include "globPattern.h" #include "globPattern.h"
#include "pvector.h" #include "pvector.h"
#include "pmap.h" #include "pmap.h"

2
dtool/src/prc/notify.cxx
View File

@ -16,7 +16,7 @@
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "notify.h" #include "pnotify.h"
#include "notifyCategory.h" #include "notifyCategory.h"
#include "configPageManager.h" #include "configPageManager.h"
#include "configVariableFilename.h" #include "configVariableFilename.h"

2
dtool/src/prc/notifyCategory.cxx
View File

@ -17,7 +17,7 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "notifyCategory.h" #include "notifyCategory.h"
#include "notify.h" #include "pnotify.h"
#include "configPageManager.h" #include "configPageManager.h"
#include "configVariableString.h" #include "configVariableString.h"
#include "configVariableBool.h" #include "configVariableBool.h"

2
dtool/src/prc/notifyCategoryProxy.h
View File

@ -23,7 +23,7 @@
#include "notifyCategory.h" #include "notifyCategory.h"
#include "notifySeverity.h" #include "notifySeverity.h"
#include "notify.h" #include "pnotify.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : NotifyCategoryProxy // Class : NotifyCategoryProxy

2
dtool/src/prc/notifySeverity.cxx
View File

@ -17,7 +17,7 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "notifySeverity.h" #include "notifySeverity.h"
#include "notify.h" #include "pnotify.h"
ostream & ostream &
operator << (ostream &out, NotifySeverity severity) { operator << (ostream &out, NotifySeverity severity) {

7
dtool/src/prckeys/signPrcFile_src.cxx
View File

@ -238,7 +238,12 @@ sign_prc(Filename filename, bool no_comments, EVP_PKEY *pkey) {
static const size_t row_width = 32; static const size_t row_width = 32;
for (size_t p = 0; p < sig_size; p += row_width) { for (size_t p = 0; p < sig_size; p += row_width) {
out << "##!sig "; out << "##!sig ";
size_t end = min(sig_size, p + row_width);
// size_t end = min(sig_size, p + row_width);
size_t end = sig_size;
if(end > p+row_width)
end = p+row_width;
for (size_t q = p; q < end; q++) { for (size_t q = p; q < end; q++) {
out << setw(2) << (unsigned int)sig_data[q]; out << setw(2) << (unsigned int)sig_data[q];
} }