diff options
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/convbdf.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_mortdat/create_mortdat.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_neverhood/create_neverhood.cpp | 2 | ||||
| -rw-r--r-- | devtools/create_project/create_project.h | 4 | ||||
| -rw-r--r-- | devtools/create_translations/create_translations.cpp | 3 | ||||
| -rw-r--r-- | devtools/create_translations/create_translations.h | 4 | ||||
| -rw-r--r-- | devtools/scumm-md5.txt | 1 |
7 files changed, 16 insertions, 6 deletions
diff --git a/devtools/convbdf.cpp b/devtools/convbdf.cpp index c8b1fb7d6d..69728eb9fd 100644 --- a/devtools/convbdf.cpp +++ b/devtools/convbdf.cpp @@ -20,6 +20,10 @@ * */ +#ifndef __has_feature // Optional of course. + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif + #include <fstream> #include <string> #include <stdio.h> diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp index 5a491eea2f..0065407daa 100644 --- a/devtools/create_mortdat/create_mortdat.cpp +++ b/devtools/create_mortdat/create_mortdat.cpp @@ -33,10 +33,6 @@ #undef main #endif // main -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #include "common/endian.h" #include "create_mortdat.h" #include "enginetext.h" diff --git a/devtools/create_neverhood/create_neverhood.cpp b/devtools/create_neverhood/create_neverhood.cpp index 446ee5ec3b..a37ff99ca9 100644 --- a/devtools/create_neverhood/create_neverhood.cpp +++ b/devtools/create_neverhood/create_neverhood.cpp @@ -30,8 +30,8 @@ #undef main #endif // main -#include <vector> #include "create_neverhood.h" +#include <vector> #include "md5.h" #include "tables.h" diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index 5325bf6d1b..2f27cc2f61 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -23,6 +23,10 @@ #ifndef TOOLS_CREATE_PROJECT_H #define TOOLS_CREATE_PROJECT_H +#ifndef __has_feature // Optional of course. + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif + #include <map> #include <list> #include <string> diff --git a/devtools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp index a153632c47..a8b04a7a52 100644 --- a/devtools/create_translations/create_translations.cpp +++ b/devtools/create_translations/create_translations.cpp @@ -22,6 +22,8 @@ * The generated files is used by ScummVM to propose translation of its GUI. */ +#include "create_translations.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -34,7 +36,6 @@ #undef main #endif // main -#include "create_translations.h" #include "po_parser.h" #include "cp_parser.h" diff --git a/devtools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h index 9ccbd39b2b..1df01e6333 100644 --- a/devtools/create_translations/create_translations.h +++ b/devtools/create_translations/create_translations.h @@ -28,4 +28,8 @@ typedef unsigned short uint16; typedef unsigned int uint32; typedef signed short int16; +#ifndef __has_feature // Optional of course. + #define __has_feature(x) 0 // Compatibility with non-clang compilers. +#endif + #endif /* CREATE_TRANSLATIONS_H */ diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index 0dbcbf4792..a52bbaecf8 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -598,6 +598,7 @@ catalog Humongous Interactive Catalog a56e8d9d4281c53c3f63c9bd22a59e21 10978342 en All HE CUP Preview George Kormendi 74da3494fbe1a7d20213b0afe0954755 10841544 fr All HE CUP Preview - George Kormendi 4c4820518e16e1a0e3616a3b021a04f3 10927456 de All HE CUP Preview - Kirben + 288fb75b24389733c29fa107fe8d44e8 10795148 us All HE CUP Preview - Kirben airport Let's Explore the Airport with Buzzy d6334a5a9b61afe18c368540fdf522ca -1 en Mac - - - Joachim Eberhard |