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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2021-02-17 10:57:30 +01:00
commit fb9b334d58
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/dist/commands.py vendored
View File

@ -94,6 +94,7 @@ PACKAGE_DATA_DIRS = {
('cefpython3/Chromium Embedded Framework.framework/Resources', 'Chromium Embedded Framework.framework/Resources', {}), ('cefpython3/Chromium Embedded Framework.framework/Resources', 'Chromium Embedded Framework.framework/Resources', {}),
('cefpython3/Chromium Embedded Framework.framework/Chromium Embedded Framework', '', {'PKG_DATA_MAKE_EXECUTABLE'}), ('cefpython3/Chromium Embedded Framework.framework/Chromium Embedded Framework', '', {'PKG_DATA_MAKE_EXECUTABLE'}),
], ],
'pytz': [('pytz/zoneinfo/*', 'zoneinfo', ())],
} }
# Some dependencies have extra directories that need to be scanned for DLLs. # Some dependencies have extra directories that need to be scanned for DLLs.

4
dtool/src/prc/encryptStreamBuf.cxx
View File

@ -95,6 +95,10 @@ EncryptStreamBuf::
~EncryptStreamBuf() { ~EncryptStreamBuf() {
close_read(); close_read();
close_write(); close_write();
#ifdef PHAVE_IOSTREAM
delete[] eback();
#endif
} }
/** /**

4
makepanda/makepandacore.py
View File

@ -1345,6 +1345,8 @@ def GetThirdpartyDir():
THIRDPARTYDIR = base + "/linux-libs-arm/" THIRDPARTYDIR = base + "/linux-libs-arm/"
elif (target_arch in ("x86_64", "amd64")): elif (target_arch in ("x86_64", "amd64")):
THIRDPARTYDIR = base + "/linux-libs-x64/" THIRDPARTYDIR = base + "/linux-libs-x64/"
elif target_arch == "aarch64":
THIRDPARTYDIR = base + "/linux-libs-aarch64/"
else: else:
THIRDPARTYDIR = base + "/linux-libs-a/" THIRDPARTYDIR = base + "/linux-libs-a/"
@ -1353,6 +1355,8 @@ def GetThirdpartyDir():
THIRDPARTYDIR = base + "/freebsd-libs-arm/" THIRDPARTYDIR = base + "/freebsd-libs-arm/"
elif (target_arch in ("x86_64", "amd64")): elif (target_arch in ("x86_64", "amd64")):
THIRDPARTYDIR = base + "/freebsd-libs-x64/" THIRDPARTYDIR = base + "/freebsd-libs-x64/"
elif target_arch == "aarch64":
THIRDPARTYDIR = base + "/freebsd-libs-aarch64/"
else: else:
THIRDPARTYDIR = base + "/freebsd-libs-a/" THIRDPARTYDIR = base + "/freebsd-libs-a/"

6
panda/src/display/graphicsWindow.cxx
View File

@ -354,9 +354,9 @@ disable_pointer_mode(int device) {
}*/ }*/
/** /**
* Returns the MouseData associated with the nth input device's pointer. This * Returns the MouseData associated with the nth input device's pointer.
* is deprecated; use get_pointer_device().get_pointer() instead, or for raw * Using this to access raw mice (with an index other than 0) is deprecated,
* mice, use the InputDeviceManager interface. * see the InputDeviceManager interface instead.
*/ */
MouseData GraphicsWindow:: MouseData GraphicsWindow::
get_pointer(int device) const { get_pointer(int device) const {