diff options
| author | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
| commit | b6374a3103787415eaad1eb2ea29559bd4c7d372 (patch) | |
| tree | 05defd71f9cd141917e2c36b7fab215718763063 /devtools | |
| parent | 47ae65e49577b1f881c2f5956ad8550f0089a4fe (diff) | |
| parent | d50e34c1bd1152170737bea6bd85c08566426eb6 (diff) | |
| download | scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.gz scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.bz2 scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_project/create_project.cpp | 1 | ||||
| -rw-r--r-- | devtools/scumm-md5.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 15830bd467..61c609be67 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -843,6 +843,7 @@ const Feature s_features[] = { { "flac", "USE_FLAC", "libFLAC_static", true, "FLAC support" }, { "png", "USE_PNG", "libpng", true, "libpng support" }, { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, + {"freetype", "USE_FREETYPE2", "freetype", true, "FreeType support" }, // Feature flags { "bink", "USE_BINK", "", true, "Bink video support" }, diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index 8caf47722a..eab7cbbcc8 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -555,7 +555,7 @@ freddi4 Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch 688328c5bdc4c8ec4145688dfa077bf2 -1 de All HE 99 Demo - Joachim Eberhard 03d3b18ee3fd68114e2a687c871e38d5 -1 us Windows HE 99 Mini Game - eriktorbjorn 16effd200aa6b8abe9c569c3e578814d -1 nl All HE 99 Demo - joostp - 499c958affc394f2a3868f1eb568c3ee -1 nl Windows HE 99 Demo - adutchguy + 499c958affc394f2a3868f1eb568c3ee -1 nl All HE 99 Demo - adutchguy 5fdb2ac2483908b065c6e77988338a54 -1 nl Windows HE 99 Demo - Ben e03ed1474ec14de78359970e0457a820 -1 gb Windows HE 99 Demo - eriktorbjorn d54622d31255619d207dd245d3f92327 -1 fr Windows HE 99 Demo - Mevi @@ -627,7 +627,7 @@ moonbase Moonbase Commander pajama Pajama Sam 1: No Need to Hide When It's Dark Outside 672dec94b82f7f0877ebb5b5cf7f4bc1 -1 us All - - - khalek 1d7a2e1ddcade791e2de0cfceac86725 -1 fr All - - - gist974, ThierryFR - 4fa6870d9bc8c313b65d54b1da5a1891 -1 nl Windows - - - joostp + 4fa6870d9bc8c313b65d54b1da5a1891 -1 nl All - - - joostp a095e33061606d231ff37dca4c64c8ac -1 de All HE 99 - - Joachim Eberhard 898eaa21f79cf8d4f08db856244689ff 66505 en Windows HE 99 Updated - Joachim Eberhard 37aed3f91c1ef959e0bd265f9b13781f -1 us All HE 100 Updated - Kirben |