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

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-09-23 11:56:22 +02:00
commit 759dc77ee1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/p3d/panda3d.pdef
View File

@ -195,7 +195,7 @@ class morepy(package):
'termios', 'tty', 'pty', 'fcntl', 'pipes', 'posixfile',
'resource', 'nis', 'syslog', 'commands', 'ic', 'MacOS',
'macostools', 'findertools', 'EasyDialogs', 'FrameWork',
'autoGIL', 'ColorPicker')
'autoGIL', 'ColorPicker', 'ast')
# To add the multitude of standard Python string encodings.
module('encodings', 'encodings.*')

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

@ -82,7 +82,7 @@ no_cert_title[LI_COUNT] = {
"Keine Signatur!",
"Sin firma!",
"Nessuna firma!",
"Ne subskribo!",
"Neniu subskribo!",
"\320\235\320\265\321\202 \320\277\320\276\320\264\320\277\320\270\321\201"
"\320\270!",
};
@ -157,7 +157,7 @@ self_signed_cert_text[LI_COUNT] = {
// epo
"\304\210i tiu aplika\304\265o de Panda3D uzas memsubskribitan ateston. "
"Tio signifas ke la nomo de la verkanto ne povas esti kontrolita, kaj vi "
"Tio signifas ke la nomo de la verkanto ne povas esti kontrolita, kaj vi "
"ne havas certan scimanieron pri la vera verkanto de la aplika\304\265o.\n"
"\n"
"Ni rekomendas ke vi premas la butonon 'Nuligi' por eviti lan\304\211on de "

3
dtool/src/dtoolutil/filename.h
View File

@ -60,10 +60,11 @@ public:
F_pattern = 0x40,
};
INLINE Filename(const char *filename);
PUBLISHED:
INLINE Filename(const string &filename = "");
INLINE Filename(const wstring &filename);
INLINE Filename(const char *filename);
INLINE Filename(const Filename &copy);
Filename(const Filename &dirname, const Filename &basename);
INLINE ~Filename();

2
makepanda/makepanda.py
View File

@ -5097,7 +5097,7 @@ if (RTDIST or RUNTIME):
OPTS += ['OPT:2']
TargetAdd('p3dcert.exe', opts=OPTS)
elif (PkgSkip("WX")==0):
OPTS.append("WX")
OPTS += ["WX", "RTTI"]
TargetAdd('plugin_p3dCert.obj', opts=OPTS, input='p3dCert_wx.cxx')
TargetAdd('p3dcert.exe', input='plugin_mkdir_complete.obj')
TargetAdd('p3dcert.exe', input='plugin_wstring_encode.obj')