diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef index d298e0e3c1..e85d7f290e 100644 --- a/direct/src/p3d/panda3d.pdef +++ b/direct/src/p3d/panda3d.pdef @@ -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.*') diff --git a/direct/src/plugin/p3dCert_strings.cxx b/direct/src/plugin/p3dCert_strings.cxx index bd191768e0..307c9b7f44 100644 --- a/direct/src/plugin/p3dCert_strings.cxx +++ b/direct/src/plugin/p3dCert_strings.cxx @@ -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 " diff --git a/dtool/src/dtoolutil/filename.h b/dtool/src/dtoolutil/filename.h index 650f7d84a6..f01d03483e 100644 --- a/dtool/src/dtoolutil/filename.h +++ b/dtool/src/dtoolutil/filename.h @@ -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 ©); Filename(const Filename &dirname, const Filename &basename); INLINE ~Filename(); diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 8e5017d4fa..464f798ced 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -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')