diff --git a/dtool/dtool_config.h b/dtool/dtool_config.h index 91eca522e9..66febee8c8 100644 --- a/dtool/dtool_config.h +++ b/dtool/dtool_config.h @@ -5,7 +5,7 @@ /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +#define WORDS_BIGENDIAN 1 /* Define if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING @@ -17,7 +17,7 @@ #define HAVE_NAMESPACE 1 /* Define if the C++ iostream library supports ios::binary. */ -#define HAVE_IOS_BINARY 1 +#undef HAVE_IOS_BINARY /* Define if we have Python installed. */ #define HAVE_PYTHON 1 @@ -59,7 +59,7 @@ #define HAVE_GETOPT 1 /* Define if you have the getopt_long_only function. */ -#define HAVE_GETOPT_LONG_ONLY 1 +#undef HAVE_GETOPT_LONG_ONLY /* Define if you have the header file. */ #define HAVE_ALLOCA_H 1 diff --git a/dtool/src/attach/ctcm.pl b/dtool/src/attach/ctcm.pl index 1b721cc22f..ea061a5ab7 100644 --- a/dtool/src/attach/ctcm.pl +++ b/dtool/src/attach/ctcm.pl @@ -490,8 +490,8 @@ sub CTCMMv { &CTUDebug( "in CTCMMv\n" ) ; local( $ret ) = 0 ; # first check that the from and to are in the project - local( $flav ) = &CTQueryProj( $_[1] ) ; - local( $root ) = &CTComputeRoot( $_[1], $flav, $_[2] ) ; + local( $flav ) = &CTQueryProj( $_[2] ) ; + local( $root ) = &CTComputeRoot( $_[2], $flav, $_[3] ) ; local( $pwd ) = &CTUCurrDir() ; local( $isok ) = 0 ; if ( $_[0] =~ /^\// ) { diff --git a/dtool/src/attach/ctntool.pl b/dtool/src/attach/ctntool.pl index a4d4352645..597fde9524 100644 --- a/dtool/src/attach/ctntool.pl +++ b/dtool/src/attach/ctntool.pl @@ -203,7 +203,7 @@ sub CTNtoolRmElem { # # output: # return success or failure -sub CTCcaseMv { +sub CTNtoolMv { &CTUDebug( "in CTNtoolMv\n" ) ; local( $ret ) = 0 ; local( $elem ) = $_[0] ; diff --git a/dtool/src/build/Makefile.bin.vars b/dtool/src/build/Makefile.bin.vars index d37745c917..7d97d50dc5 100644 --- a/dtool/src/build/Makefile.bin.vars +++ b/dtool/src/build/Makefile.bin.vars @@ -23,6 +23,14 @@ endif LPATH_DIRS := $(strip $(shell ctpathadjust $(subst :, ,$(CT_LIBRARY_PATH)))) $(patsubst -L%,%,$(LPATH)) +# Legacy. +ifneq (,$(PYTHON_LIB)) + LPATH_DIRS += $(PYTHON_LIB) +endif +ifneq (,$(NSPR_LIB)) + LPATH_DIRS += $(NSPR_LIB) +endif + ifeq (WIN32_VC,$(PENV_COMPILER)) lt := $(foreach path,$(LPATH_DIRS),$(shell cygpath -w $(path))) LPATH := $(patsubst %,-LIBPATH:"%",$(lt)) diff --git a/dtool/src/build/Makefile.o.vars b/dtool/src/build/Makefile.o.vars index 00d99ee8ed..3975b93133 100644 --- a/dtool/src/build/Makefile.o.vars +++ b/dtool/src/build/Makefile.o.vars @@ -79,6 +79,14 @@ endif IPATH_DIRS := $(strip $(shell ctpathadjust $(CT_INCLUDE_PATH))) $(patsubst -I%,%,$(IPATH)) +# Legacy. +ifneq (,$(PYTHON_INCLUDE)) + IPATH_DIRS += $(PYTHON_INCLUDE) +endif +ifneq (,$(NSPR_INCLUDE)) + IPATH_DIRS += $(NSPR_INCLUDE) +endif + # Add one more for dtool_config.h IPATH_DIRS += $(DTOOL) diff --git a/dtool/src/build/Makefile.penv.vars b/dtool/src/build/Makefile.penv.vars index ab5a2926e6..649ef32c8d 100644 --- a/dtool/src/build/Makefile.penv.vars +++ b/dtool/src/build/Makefile.penv.vars @@ -27,6 +27,12 @@ ifeq (SGI,$(PENV)) SGI_BINFORMAT_LIB = lib32 endif + # Legacy. + PYTHON_INCLUDE = /usr/local/include/python1.6 + NSPR_PATH = /for/program/mozilla/dist/IRIX6.5_n32_PTH_DBG.OBJ + NSPR_INCLUDE = $(NSPR_PATH)/include + NSPR_LIB = $(NSPR_PATH)/lib + SYSTEM_IGATE_FLAGS = -D__mips__ -D__MIPSEB__ -DPENV_SGI endif @@ -38,6 +44,12 @@ ifeq (Linux,$(PENV)) SYSTEM_IGATE_FLAGS = -D__i386__ -DPENV_LINUX + # Legacy. + PYTHON_INCLUDE = /usr/local/include/python1.6 + NSPR_PATH = /usr/local/mozilla/dist/Linux2.2.10_x86_PTH_DBG.OBJ + NSPR_INCLUDE = $(NSPR_PATH)/include + NSPR_LIB = $(NSPR_PATH)/lib + endif ifeq (WIN32,$(PENV)) diff --git a/dtool/src/interrogate/interrogateBuilder.cxx b/dtool/src/interrogate/interrogateBuilder.cxx index cbaa47d520..5a55b8f8bc 100644 --- a/dtool/src/interrogate/interrogateBuilder.cxx +++ b/dtool/src/interrogate/interrogateBuilder.cxx @@ -288,7 +288,8 @@ write_code(ostream &out, InterrogateModuleDef *def) { // #include lines. if (!no_database) { out << "#include \n" - << "#include \n"; + << "#include \n" + << "#include \n"; } if (watch_asserts) { out << "#include \n"; diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h index 7441611704..4012b70790 100644 --- a/panda/src/pandabase/pandasymbols.h +++ b/panda/src/pandabase/pandasymbols.h @@ -92,6 +92,23 @@ #define EXPTP_FRAMEWORK extern #endif +/* These are temporarily here until we move them to their proper homes. */ +#ifdef BUILDING_DIRECT + #define EXPCL_DIRECT __declspec(dllexport) + #define EXPTP_DIRECT +#else + #define EXPCL_DIRECT __declspec(dllimport) + #define EXPTP_DIRECT extern +#endif + +#ifdef BUILDING_TOONTOWN + #define EXPCL_TOONTOWN __declspec(dllexport) + #define EXPTP_TOONTOWN +#else + #define EXPCL_TOONTOWN __declspec(dllimport) + #define EXPTP_TOONTOWN extern +#endif + #else /* !PENV_WIN32 */ #define EXPCL_PANDA @@ -124,6 +141,13 @@ #define EXPCL_FRAMEWORK #define EXPTP_FRAMEWORK +/* These are temporarily here until we move them to their proper homes. */ +#define EXPCL_DIRECT +#define EXPTP_DIRECT + +#define EXPCL_TOONTOWN +#define EXPTP_TOONTOWN + #endif /* PENV_WIN32 */ #endif diff --git a/panda/src/testbed/Sources.pp b/panda/src/testbed/Sources.pp index bf82d049f0..b1316a02fc 100644 --- a/panda/src/testbed/Sources.pp +++ b/panda/src/testbed/Sources.pp @@ -1,7 +1,10 @@ #define OTHER_LIBS interrogatedb dconfig dtoolutil dtoolbase pystub #define LOCAL_LIBS \ framework putil collide loader sgmanip chan text chancfg cull \ - pnmimage pnmimagetypes event effects shader + pnmimage pnmimagetypes event effects shader graph gobj display \ + mathutil sgattrib putil express light dgraph device tform sgraph \ + linmath pstatclient sgraphutil +#define UNIX_SYS_LIBS m #begin bin_target