diff --git a/direct/src/distributed/cConnectionRepository.cxx b/direct/src/distributed/cConnectionRepository.cxx index 41fb3d6286..1781422930 100644 --- a/direct/src/distributed/cConnectionRepository.cxx +++ b/direct/src/distributed/cConnectionRepository.cxx @@ -403,7 +403,7 @@ send_datagram(const Datagram &dg) { #ifdef WANT_NATIVE_NET if (_native) { - bool result = _bdc.SendMessage(); + bool result = _bdc.SendMessage(dg); if (!result && _bdc.IsConnected()) { #ifdef HAVE_PYTHON ostringstream s; @@ -415,8 +415,8 @@ send_datagram(const Datagram &dg) { #endif s << endl << "Error sending message: " << endl; - msg.dump_hex(s); - s << "Message data: " << msg.get_data() << endl; + dg.dump_hex(s); + s << "Message data: " << dg.get_data() << endl; string message = s.str(); PyErr_SetString(exc_type, message.c_str()); diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 8cde77e0f7..d1def1ec8e 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2122,9 +2122,7 @@ DTOOL_CONFIG=[ ("COMPILE_IN_DEFAULT_FONT", '1', '1'), ("STDFLOAT_DOUBLE", 'UNDEF', 'UNDEF'), ("HAVE_MAYA", '1', '1'), - ("MAYA_PRE_5_0", 'UNDEF', 'UNDEF'), ("HAVE_SOFTIMAGE", 'UNDEF', 'UNDEF'), - ("SSL_097", 'UNDEF', 'UNDEF'), ("REPORT_OPENSSL_ERRORS", '1', '1'), ("USE_PANDAFILESTREAM", '1', '1'), ("USE_DELETED_CHAIN", '1', '1'), @@ -2132,7 +2130,6 @@ DTOOL_CONFIG=[ ("HAVE_GLX", 'UNDEF', '1'), ("HAVE_WGL", '1', 'UNDEF'), ("HAVE_DX9", 'UNDEF', 'UNDEF'), - ("HAVE_CHROMIUM", 'UNDEF', 'UNDEF'), ("HAVE_THREADS", '1', '1'), ("SIMPLE_THREADS", 'UNDEF', 'UNDEF'), ("OS_SIMPLE_THREADS", '1', '1'), @@ -2145,12 +2142,9 @@ DTOOL_CONFIG=[ ("DO_COLLISION_RECORDING", 'UNDEF', 'UNDEF'), ("SUPPORT_IMMEDIATE_MODE", 'UNDEF', 'UNDEF'), ("SUPPORT_FIXED_FUNCTION", '1', '1'), - ("TRACK_IN_INTERPRETER", 'UNDEF', 'UNDEF'), ("DO_MEMORY_USAGE", 'UNDEF', 'UNDEF'), ("DO_PIPELINING", '1', '1'), ("EXPORT_TEMPLATES", 'yes', 'yes'), - ("LINK_IN_GL", 'UNDEF', 'UNDEF'), - ("LINK_IN_PHYSICS", 'UNDEF', 'UNDEF'), ("DEFAULT_PATHSEP", '";"', '":"'), ("WORDS_BIGENDIAN", 'UNDEF', 'UNDEF'), ("HAVE_NAMESPACE", '1', '1'), @@ -2212,7 +2206,6 @@ DTOOL_CONFIG=[ ("IS_LINUX", 'UNDEF', '1'), ("IS_OSX", 'UNDEF', 'UNDEF'), ("IS_FREEBSD", 'UNDEF', 'UNDEF'), - ("GLOBAL_OPERATOR_NEW_EXCEPTIONS", 'UNDEF', '1'), ("HAVE_EIGEN", 'UNDEF', 'UNDEF'), ("LINMATH_ALIGN", '1', '1'), ("HAVE_ZLIB", 'UNDEF', 'UNDEF'), @@ -2230,11 +2223,12 @@ DTOOL_CONFIG=[ ("HAVE_PNM", '1', '1'), ("HAVE_STB_IMAGE", '1', '1'), ("HAVE_VORBIS", 'UNDEF', 'UNDEF'), - ("HAVE_NVIDIACG", 'UNDEF', 'UNDEF'), ("HAVE_FREETYPE", 'UNDEF', 'UNDEF'), ("HAVE_FFTW", 'UNDEF', 'UNDEF'), ("HAVE_OPENSSL", 'UNDEF', 'UNDEF'), ("HAVE_NET", 'UNDEF', 'UNDEF'), + ("WANT_NATIVE_NET", '1', '1'), + ("SIMULATE_NETWORK_DELAY", 'UNDEF', 'UNDEF'), ("HAVE_EGG", '1', '1'), ("HAVE_CG", 'UNDEF', 'UNDEF'), ("HAVE_CGGL", 'UNDEF', 'UNDEF'), @@ -2246,12 +2240,12 @@ DTOOL_CONFIG=[ ("HAVE_OPENCV", 'UNDEF', 'UNDEF'), ("HAVE_DIRECTCAM", 'UNDEF', 'UNDEF'), ("HAVE_SQUISH", 'UNDEF', 'UNDEF'), - ("HAVE_FCOLLADA", 'UNDEF', 'UNDEF'), ("HAVE_CARBON", 'UNDEF', 'UNDEF'), ("HAVE_COCOA", 'UNDEF', 'UNDEF'), ("HAVE_OPENAL_FRAMEWORK", 'UNDEF', 'UNDEF'), ("HAVE_ROCKET_PYTHON", '1', '1'), ("HAVE_ROCKET_DEBUGGER", 'UNDEF', 'UNDEF'), + ("USE_TAU", 'UNDEF', 'UNDEF'), ("PRC_SAVE_DESCRIPTIONS", '1', '1'), # ("_SECURE_SCL", '0', 'UNDEF'), # ("_SECURE_SCL_THROWS", '0', 'UNDEF'), @@ -2373,9 +2367,6 @@ def WriteConfigSettings(): if (GetOptimize() <= 3): dtool_config["DO_COLLISION_RECORDING"] = '1' - #if (GetOptimize() <= 2): - # dtool_config["TRACK_IN_INTERPRETER"] = '1' - if (GetOptimize() <= 3): dtool_config["DO_MEMORY_USAGE"] = '1' @@ -4425,8 +4416,17 @@ if (not RUNTIME): # if (not RUNTIME): - OPTS=['DIR:panda/src/framework', 'BUILDING:FRAMEWORK'] - TargetAdd('p3framework_composite1.obj', opts=OPTS, input='p3framework_composite1.cxx') + deps = [] + # Framework wants to link in a renderer when building statically, so tell it what is available. + if GetLinkAllStatic(): + deps = ['dtool_have_gl.dat', 'dtool_have_tinydisplay.dat'] + if not PkgSkip("GL"): + DefSymbol("FRAMEWORK", "HAVE_GL") + if not PkgSkip("TINYDISPLAY"): + DefSymbol("FRAMEWORK", "HAVE_TINYDISPLAY") + + OPTS=['DIR:panda/src/framework', 'BUILDING:FRAMEWORK', 'FRAMEWORK'] + TargetAdd('p3framework_composite1.obj', opts=OPTS, input='p3framework_composite1.cxx', dep=deps) TargetAdd('libp3framework.dll', input='p3framework_composite1.obj') TargetAdd('libp3framework.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3framework.dll', opts=['ADVAPI']) @@ -6005,8 +6005,11 @@ if (PkgSkip("PANDATOOL")==0): # if (PkgSkip("PANDATOOL")==0): + if not PkgSkip("FCOLLADA"): + DefSymbol("FCOLLADA", "HAVE_FCOLLADA") + OPTS=['DIR:pandatool/src/ptloader', 'DIR:pandatool/src/flt', 'DIR:pandatool/src/lwo', 'DIR:pandatool/src/xfile', 'DIR:pandatool/src/xfileegg', 'DIR:pandatool/src/daeegg', 'BUILDING:PTLOADER', 'FCOLLADA'] - TargetAdd('p3ptloader_config_ptloader.obj', opts=OPTS, input='config_ptloader.cxx') + TargetAdd('p3ptloader_config_ptloader.obj', opts=OPTS, input='config_ptloader.cxx', dep='dtool_have_fcollada.dat') TargetAdd('p3ptloader_loaderFileTypePandatool.obj', opts=OPTS, input='loaderFileTypePandatool.cxx') TargetAdd('libp3ptloader.dll', input='p3ptloader_config_ptloader.obj') TargetAdd('libp3ptloader.dll', input='p3ptloader_loaderFileTypePandatool.obj') diff --git a/panda/src/audiotraits/openalAudioManager.h b/panda/src/audiotraits/openalAudioManager.h index f78e8a53ea..70089c138d 100644 --- a/panda/src/audiotraits/openalAudioManager.h +++ b/panda/src/audiotraits/openalAudioManager.h @@ -23,7 +23,7 @@ #include "reMutex.h" // OSX uses the OpenAL framework -#ifdef IS_OSX +#ifdef HAVE_OPENAL_FRAMEWORK #include #include #else diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h index 95fd736190..3442acb4f2 100644 --- a/panda/src/audiotraits/openalAudioSound.h +++ b/panda/src/audiotraits/openalAudioSound.h @@ -21,7 +21,7 @@ #include "openalAudioManager.h" // OSX uses the OpenAL framework -#ifdef IS_OSX +#ifdef HAVE_OPENAL_FRAMEWORK #include #include #else diff --git a/panda/src/downloader/httpClient.cxx b/panda/src/downloader/httpClient.cxx index 0366107669..26baaff0c1 100644 --- a/panda/src/downloader/httpClient.cxx +++ b/panda/src/downloader/httpClient.cxx @@ -1110,7 +1110,7 @@ get_ssl_ctx() { _ssl_ctx = SSL_CTX_new(SSLv23_client_method()); -#if defined(SSL_097) && !defined(NDEBUG) +#ifndef NDEBUG // If we have debugging enabled, set a callback that allows us to report the // SSL messages as they are sent and received. if (downloader_cat.is_debug()) { @@ -1554,7 +1554,7 @@ split_whitespace(string &a, string &b, const string &c) { b = c.substr(p); } -#if defined(SSL_097) && !defined(NDEBUG) +#ifndef NDEBUG /** * This method is attached as a callback for SSL messages only when debug * output is enabled. @@ -1614,7 +1614,7 @@ ssl_msg_callback(int write_p, int version, int content_type, downloader_cat.debug() << describe.str(); } -#endif // defined(SSL_097) && !defined(NDEBUG) +#endif // !defined(NDEBUG) /** * diff --git a/panda/src/downloader/httpClient.h b/panda/src/downloader/httpClient.h index 32f9d38a7b..d901066357 100644 --- a/panda/src/downloader/httpClient.h +++ b/panda/src/downloader/httpClient.h @@ -155,7 +155,7 @@ private: static void split_whitespace(string &a, string &b, const string &c); -#if defined(SSL_097) && !defined(NDEBUG) +#ifndef NDEBUG static void ssl_msg_callback(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg); diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx index c99c83bdb3..2f7cda439b 100644 --- a/panda/src/express/multifile.cxx +++ b/panda/src/express/multifile.cxx @@ -2478,12 +2478,7 @@ check_signatures() { } if (pkey != NULL) { - EVP_MD_CTX *md_ctx; -#ifdef SSL_097 - md_ctx = EVP_MD_CTX_create(); -#else - md_ctx = new EVP_MD_CTX; -#endif + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); EVP_VerifyInit(md_ctx, EVP_sha1()); nassertv(_read != NULL); @@ -2764,12 +2759,7 @@ write_data(ostream &write, istream *read, streampos fpos, // And we also need to have a private key. nassertr(_pkey != NULL, fpos); - EVP_MD_CTX *md_ctx; -#ifdef SSL_097 - md_ctx = EVP_MD_CTX_create(); -#else - md_ctx = new EVP_MD_CTX; -#endif + EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); EVP_SignInit(md_ctx, EVP_sha1()); // Read and hash the multifile contents, but only up till @@ -2807,11 +2797,7 @@ write_data(ostream &write, istream *read, streampos fpos, delete[] sig_data; -#ifdef SSL_097 EVP_MD_CTX_destroy(md_ctx); -#else - delete md_ctx; -#endif } #endif // HAVE_OPENSSL