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

support max 2013 and above

Browse Source
This commit is contained in:
rdb 2013-10-07 20:15:38 +00:00
parent 7720c482c7
commit 849b60c6e9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makepanda/makepanda.py
View File

@ -469,6 +469,9 @@ if (COMPILER == "MSVC"):
IncDirectory(pkg, SDK[pkg+"CS"] + "/include") IncDirectory(pkg, SDK[pkg+"CS"] + "/include")
IncDirectory(pkg, SDK[pkg+"CS"] + "/include/CS") IncDirectory(pkg, SDK[pkg+"CS"] + "/include/CS")
DefSymbol(pkg, "MAX", pkg) DefSymbol(pkg, "MAX", pkg)
if (int(pkg[3:]) >= 2013):
DefSymbol(pkg, "UNICODE", "")
DefSymbol(pkg, "_UNICODE", "")
elif (pkg[:2]=="DX"): elif (pkg[:2]=="DX"):
IncDirectory(pkg, SDK[pkg] + "/include") IncDirectory(pkg, SDK[pkg] + "/include")
elif GetThirdpartyDir() is not None: elif GetThirdpartyDir() is not None:

2
pandatool/src/maxegg/maxEgg.h
View File

@ -132,7 +132,7 @@ class MaxEggPlugin : public HelperObject
CreateMouseCallBack* GetCreateMouseCallBack(); CreateMouseCallBack* GetCreateMouseCallBack();
void BeginEditParams( IObjParam *ip, ULONG flags,Animatable *prev); void BeginEditParams( IObjParam *ip, ULONG flags,Animatable *prev);
void EndEditParams( IObjParam *ip, ULONG flags,Animatable *next); void EndEditParams( IObjParam *ip, ULONG flags,Animatable *next);
#if MAX_VERSION_MAJOR < 16 #if MAX_VERSION_MAJOR < 15
MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); } MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); }
#else #else
const MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); } const MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); }

4
pandatool/src/maxegg/maxOptionsDialog.cxx
View File

@ -164,7 +164,7 @@ public:
AddNodeCB (MaxOptionsDialog *instance, HWND wnd) : AddNodeCB (MaxOptionsDialog *instance, HWND wnd) :
ph(instance), hWnd(wnd) {} ph(instance), hWnd(wnd) {}
#if MAX_VERSION_MAJOR < 16 #if MAX_VERSION_MAJOR < 15
virtual MCHAR *dialogTitle() {return _M("Objects to Export");} virtual MCHAR *dialogTitle() {return _M("Objects to Export");}
virtual MCHAR *buttonText() {return _M("Select");} virtual MCHAR *buttonText() {return _M("Select");}
#else #else
@ -223,7 +223,7 @@ public:
RemoveNodeCB (MaxOptionsDialog *instance, HWND wnd) : RemoveNodeCB (MaxOptionsDialog *instance, HWND wnd) :
ph(instance), hWnd(wnd) {} ph(instance), hWnd(wnd) {}
#if MAX_VERSION_MAJOR < 16 #if MAX_VERSION_MAJOR < 15
virtual MCHAR *dialogTitle() {return _M("Objects to Remove");} virtual MCHAR *dialogTitle() {return _M("Objects to Remove");}
virtual MCHAR *buttonText() {return _M("Remove");} virtual MCHAR *buttonText() {return _M("Remove");}
#else #else