From 849b60c6e9e9e06e0b801bbfc5ee89e8671bd755 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 7 Oct 2013 20:15:38 +0000 Subject: [PATCH] support max 2013 and above --- makepanda/makepanda.py | 3 +++ pandatool/src/maxegg/maxEgg.h | 2 +- pandatool/src/maxegg/maxOptionsDialog.cxx | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 2f69aab63e..878584a1d0 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -469,6 +469,9 @@ if (COMPILER == "MSVC"): IncDirectory(pkg, SDK[pkg+"CS"] + "/include") IncDirectory(pkg, SDK[pkg+"CS"] + "/include/CS") DefSymbol(pkg, "MAX", pkg) + if (int(pkg[3:]) >= 2013): + DefSymbol(pkg, "UNICODE", "") + DefSymbol(pkg, "_UNICODE", "") elif (pkg[:2]=="DX"): IncDirectory(pkg, SDK[pkg] + "/include") elif GetThirdpartyDir() is not None: diff --git a/pandatool/src/maxegg/maxEgg.h b/pandatool/src/maxegg/maxEgg.h index 4e3cb481f6..6664f6b122 100755 --- a/pandatool/src/maxegg/maxEgg.h +++ b/pandatool/src/maxegg/maxEgg.h @@ -132,7 +132,7 @@ class MaxEggPlugin : public HelperObject CreateMouseCallBack* GetCreateMouseCallBack(); void BeginEditParams( IObjParam *ip, ULONG flags,Animatable *prev); void EndEditParams( IObjParam *ip, ULONG flags,Animatable *next); -#if MAX_VERSION_MAJOR < 16 +#if MAX_VERSION_MAJOR < 15 MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); } #else const MCHAR *GetObjectName() { return GetString(IDS_LIBDESCRIPTION); } diff --git a/pandatool/src/maxegg/maxOptionsDialog.cxx b/pandatool/src/maxegg/maxOptionsDialog.cxx index 871e7305c1..2598604be4 100644 --- a/pandatool/src/maxegg/maxOptionsDialog.cxx +++ b/pandatool/src/maxegg/maxOptionsDialog.cxx @@ -164,7 +164,7 @@ public: AddNodeCB (MaxOptionsDialog *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 *buttonText() {return _M("Select");} #else @@ -223,7 +223,7 @@ public: RemoveNodeCB (MaxOptionsDialog *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 *buttonText() {return _M("Remove");} #else