diff options
| author | Johannes Schickel | 2013-09-17 02:31:04 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-09-17 02:35:16 +0200 |
| commit | 856da53e8b232134561308328989cd12259bb063 (patch) | |
| tree | 64992bc877577fb9c3658288db34adabfd631fe1 | |
| parent | 783aa9977c544c7e63aef3dac4fff85abcb682ce (diff) | |
| download | scummvm-rg350-856da53e8b232134561308328989cd12259bb063.tar.gz scummvm-rg350-856da53e8b232134561308328989cd12259bb063.tar.bz2 scummvm-rg350-856da53e8b232134561308328989cd12259bb063.zip | |
DEVTOOLS: Adapt create_project for libjpeg support.
The library name of the static library is based on what libjpeg-turbo uses
which should be fine for Windows at least.
Untested except for compilation of create_project.
| -rw-r--r-- | devtools/create_project/codeblocks.cpp | 5 | ||||
| -rw-r--r-- | devtools/create_project/create_project.cpp | 1 |
2 files changed, 6 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" }, |