diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-05-12 00:33:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 00:33:13 +0300 |
| commit | 5f40f06bf024e3806e0fe5a92ca14ee6b22a9933 (patch) | |
| tree | 3008c5a5977736453221f00daa1f34f9d292906b /src/animation | |
| parent | 70a8234dad441b73c998ee11b2932071ce55c540 (diff) | |
| parent | c4a154557bad4a610abfc3424d392cf2fd9c4cfa (diff) | |
Merge pull request #533 from erorcun/master
Linux build support
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 4 | ||||
| -rw-r--r-- | src/animation/CutsceneMgr.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index 5a6d10b4..fe419f2a 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -1,6 +1,10 @@ #include "common.h" +#if defined _WIN32 && !defined __MINGW32__ #include "ctype.h" +#else +#include <cwctype> +#endif #include "General.h" #include "RwHelper.h" diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp index 0db54c4b..230e22fb 100644 --- a/src/animation/CutsceneMgr.cpp +++ b/src/animation/CutsceneMgr.cpp @@ -103,7 +103,7 @@ const struct { { "MT_PH2", STREAMED_SOUND_CUTSCENE_MARTY_PH2 }, { "MT_PH3", STREAMED_SOUND_CUTSCENE_MARTY_PH3 }, { "MT_PH4", STREAMED_SOUND_CUTSCENE_MARTY_PH4 }, - { NULL, NULL } + { NULL, 0 } }; int |