diff options
| author | RichieSams | 2013-09-29 18:04:53 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-29 18:04:53 -0500 |
| commit | 49d67caa31583478b1b58df19b5739f42d5a4573 (patch) | |
| tree | faa9ee3e3e9346eedccaf44bbfeb054164223e0a /devtools/create_project | |
| parent | 07c32312146bb7fe5adec41f03a2463893756361 (diff) | |
| parent | 1c3202794ad71e59e9496b94ac51f102f8210b54 (diff) | |
| download | scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.gz scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.bz2 scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.zip | |
Merge branch 'master' into zvision
Diffstat (limited to 'devtools/create_project')
| -rw-r--r-- | devtools/create_project/codeblocks.cpp | 5 | ||||
| -rw-r--r-- | devtools/create_project/create_project.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_project/create_project.h | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp index 3458ca5a19..ec003df2d5 100644 --- a/devtools/create_project/codeblocks.cpp +++ b/devtools/create_project/codeblocks.cpp @@ -64,6 +64,11 @@ std::string processLibraryName(std::string name) { if (pos != std::string::npos) return name.replace(pos, 7, ""); + // Remove "-static" in lib name + pos = name.find("-static"); + if (pos != std::string::npos) + return name.replace(pos, 7, ""); + // Replace "zlib" by "libz" if (name == "zlib") return "libz"; diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 7ae2df35c8..e013377241 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -845,6 +845,7 @@ const Feature s_features[] = { { "mpeg2", "USE_MPEG2", "libmpeg2", false, "MPEG-2 support" }, { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, {"freetype", "USE_FREETYPE2", "freetype", true, "FreeType support" }, + { "jpeg", "USE_JPEG", "jpeg-static", true, "libjpeg support" }, // Feature flags { "bink", "USE_BINK", "", true, "Bink video support" }, 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> |