TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rtdist compile issues

Browse Source
This commit is contained in:
rdb 2015-03-22 19:38:46 +01:00
parent 9bf5885312
commit 0ee5be581c
6 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/plugin/p3dCert.cxx
View File

@ -557,7 +557,7 @@ get_text(char *header, size_t hlen, char *text, size_t tlen) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
strncpy(header, "Unverified signature!", hlen);
snprintf(text, tlen, unknown_auth_cert_text, _friendly_name.c_str());
snprintf(text, tlen, unknown_auth_cert_text);
break;
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:

6
direct/src/plugin/p3dInstance.cxx
View File

@ -782,6 +782,9 @@ get_request() {
}
}
break;
default:
break;
}
}
@ -935,6 +938,9 @@ finish_request(P3D_request *request, bool handled) {
request->_request._forget_package._package_version = NULL;
}
break;
default:
break;
}
p3d_unref_delete(((P3DInstance *)request->_instance));

8
direct/src/plugin/p3dMainObject.cxx
View File

@ -579,10 +579,10 @@ read_log(const string &log_pathname, P3D_object *params[], int num_params) {
string log_matching_pathname;
inst_mgr->scan_directory(log_directory, all_logs);
for (int i = (int)all_logs.size() - 1; i >= 0; --i) {
if ((all_logs[i] == log_leafname_primary) ||
(all_logs[i].find(log_basename) == 0) &&
(all_logs[i].size() > 4) &&
(all_logs[i].substr(all_logs[i].size() - 4) == string(".log"))) {
if (all_logs[i] == log_leafname_primary ||
(all_logs[i].find(log_basename) == 0 &&
all_logs[i].size() > 4 &&
all_logs[i].substr(all_logs[i].size() - 4) == string(".log"))) {
log_matches_found++;
log_matching_pathname = (log_directory + all_logs[i]);
read_log_file(log_matching_pathname, tail_bytes, head_bytes, log_data);

4
direct/src/plugin/p3dPackage.cxx
View File

@ -1539,6 +1539,10 @@ download_progress() {
assert(_package->_active_download == this);
switch (_dtype) {
case DT_contents_file:
case DT_redownload_contents_file:
break;
case DT_desc_file:
break;

1
direct/src/plugin/p3dX11SplashWindow.cxx
View File

@ -1060,7 +1060,6 @@ update_image(X11ImageData &image) {
_needs_new_composite = true;
// Go read the image.
string data;
if (!read_image_data(image, image._data, image._filename)) {
return;
}

3
makepanda/makepanda.py
View File

@ -4785,11 +4785,13 @@ if (RTDIST or RUNTIME):
TargetAdd('p3dpython.exe', input='p3dpython_p3dpython_composite1.obj')
TargetAdd('p3dpython.exe', input='p3dpython_p3dPythonMain.obj')
TargetAdd('p3dpython.exe', input=COMMON_PANDA_LIBS)
TargetAdd('p3dpython.exe', input='core.pyd')
TargetAdd('p3dpython.exe', input='libp3tinyxml.ilb')
TargetAdd('p3dpython.exe', opts=['PYTHON', 'WINUSER'])
TargetAdd('libp3dpython.dll', input='p3dpython_p3dpython_composite1.obj')
TargetAdd('libp3dpython.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libp3dpython.dll', input='core.pyd')
TargetAdd('libp3dpython.dll', input='libp3tinyxml.ilb')
TargetAdd('libp3dpython.dll', opts=['PYTHON', 'WINUSER'])
@ -4801,6 +4803,7 @@ if (RTDIST or RUNTIME):
TargetAdd('p3dpythonw.exe', input='p3dpythonw_p3dpython_composite1.obj')
TargetAdd('p3dpythonw.exe', input='p3dpythonw_p3dPythonMain.obj')
TargetAdd('p3dpythonw.exe', input=COMMON_PANDA_LIBS)
TargetAdd('p3dpythonw.exe', input='core.pyd')
TargetAdd('p3dpythonw.exe', input='libp3tinyxml.ilb')
TargetAdd('p3dpythonw.exe', opts=['SUBSYSTEM:WINDOWS', 'PYTHON', 'WINUSER'])