[Scummvm-cvs-logs] scummvm master -> 856da53e8b232134561308328989cd12259bb063
lordhoto
lordhoto at gmail.com
Tue Sep 17 02:35:52 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
856da53e8b DEVTOOLS: Adapt create_project for libjpeg support.
Commit: 856da53e8b232134561308328989cd12259bb063
https://github.com/scummvm/scummvm/commit/856da53e8b232134561308328989cd12259bb063
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-09-16T17:35:16-07:00
Commit Message:
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.
Changed paths:
devtools/create_project/codeblocks.cpp
devtools/create_project/create_project.cpp
diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index 3458ca5..ec003df 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 7ae2df3..e013377 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" },
More information about the Scummvm-git-logs
mailing list