Skip to content

Commit b39fadd

Browse files
committed
fix: restore old sdk windows build compatibility
1 parent 5d09e97 commit b39fadd

25 files changed

Lines changed: 51 additions & 28 deletions

source/CMTSceneManager.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ Description: scene manager
1010

1111
#pragma once
1212

13+
#include <memory>
14+
#include "libMMD/Model/MMD/PMXFile.h"
15+
#include "libMMD/Model/MMD/VMDFile.h"
16+
#include "libMMD/Model/MMD/VMDAnimation.h"
17+
#include "libMMD/Model/MMD/VMDCameraAnimation.h"
1318
#include <c4d.h>
1419
#include "maxon/baselist.h"
1520
#include "c4d_baselinkarray.h"
1621
#include "cmt_tools_setting.h"
1722
#include "module/core/cmt_marco.h"
18-
#include "libMMD/Model/MMD/PMXFile.h"
19-
#include "libMMD/Model/MMD/VMDFile.h"
20-
#include "libMMD/Model/MMD/VMDAnimation.h"
21-
#include "libMMD/Model/MMD/VMDCameraAnimation.h"
2223

2324
struct IOLog
2425
{

source/cmt_tools_config_manager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Description: Manager of plugin configuration
1010

1111
#pragma once
1212

13-
#include <c4d.h>
14-
#include <c4d_symbols.h>
1513
#include <cassert>
1614
#include <string>
1715
#include <variant>
16+
#include <c4d.h>
17+
#include <c4d_symbols.h>
1818
#include "module/core/cmt_marco.h"
1919
#include "utils/json_util.hpp"
2020

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#pragma once
2+
3+
// Preload the STL before old Windows C4D SDK headers force _HAS_EXCEPTIONS=0.
4+
// This keeps later transitive standard-library includes from hitting MSVC's
5+
// _RAISE/_Doraise incompatibilities in R20/R21 builds.
6+
#include <algorithm>
7+
#include <array>
8+
#include <cstdint>
9+
#include <exception>
10+
#include <functional>
11+
#include <memory>
12+
#include <stdexcept>
13+
#include <string>
14+
#include <system_error>
15+
#include <typeinfo>
16+
#include <utility>
17+
#include <vector>

source/module/tools/material/mmd_corona_material.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "module/core/cmt_old_sdk_stl_preload.h"
12
#include "mmd_corona_material.h"
23
#include <c4d_symbols.h>
34

source/module/tools/material/mmd_corona_material.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include <c4d.h>
43
#include "module/tools/material/mmd_material.h"
54

65
/** Corona 材质适配器:使用基类共享的 DetectTextureFromPMX/DetectTextureFromData。 */

source/module/tools/material/mmd_material.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "module/core/cmt_old_sdk_stl_preload.h"
12
#include "mmd_material.h"
23
#include "mmd_standard_material.h"
34
#include "mmd_redshift_material.h"

source/module/tools/material/mmd_material.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <c4d.h>
43
#include <memory>
5-
#include "module/core/cmt_marco.h"
64
#include "libMMD/Model/MMD/PMXFile.h"
5+
#include <c4d.h>
6+
#include "module/core/cmt_marco.h"
77

88
namespace CMTToolsSetting
99
{

source/module/tools/material/mmd_octane_material.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "module/core/cmt_old_sdk_stl_preload.h"
12
#include "mmd_octane_material.h"
23
#include <c4d_symbols.h>
34

source/module/tools/material/mmd_octane_material.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include <c4d.h>
43
#include "module/tools/material/mmd_material.h"
54

65
/** Octane 材质适配器:使用基类共享的 DetectTextureFromPMX/DetectTextureFromData。 */

source/module/tools/material/mmd_redshift_material.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "module/core/cmt_old_sdk_stl_preload.h"
12
#include "mmd_redshift_material.h"
23
#include <c4d_symbols.h>
34
#include "module/core/cmt_marco.h"

0 commit comments

Comments
 (0)