diff options
| author | Cameron Cawley | 2018-11-03 23:06:10 +0000 |
|---|---|---|
| committer | David Turner | 2018-11-27 22:58:02 +0000 |
| commit | 8fa2f90a2638f9d635cc2e1e55093e671734274c (patch) | |
| tree | dcf2cc1d79bec26e64001696d8f2f03f6e268639 /devtools/create_project/xcode.cpp | |
| parent | e016efce564eef518461a665d39ab1dc9056a7ff (diff) | |
| download | scummvm-rg350-8fa2f90a2638f9d635cc2e1e55093e671734274c.tar.gz scummvm-rg350-8fa2f90a2638f9d635cc2e1e55093e671734274c.tar.bz2 scummvm-rg350-8fa2f90a2638f9d635cc2e1e55093e671734274c.zip | |
CREATE_PROJECT: Support building with Tremor instead of Vorbis
Diffstat (limited to 'devtools/create_project/xcode.cpp')
| -rw-r--r-- | devtools/create_project/xcode.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index e6ba6a8ba1..a04d250a3e 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -486,11 +486,16 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) { DEF_LOCALLIB_STATIC("libpng"); } - if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { + if (CONTAINS_DEFINE(setup.defines, "USE_OGG")) { DEF_LOCALLIB_STATIC("libogg"); + } + if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) { DEF_LOCALLIB_STATIC("libvorbis"); DEF_LOCALLIB_STATIC("libvorbisfile"); } + if (CONTAINS_DEFINE(setup.defines, "USE_TREMOR")) { + DEF_LOCALLIB_STATIC("libvorbisidec"); + } if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { DEF_LOCALLIB_STATIC("libtheoradec"); } @@ -549,11 +554,16 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) { frameworks_iOS.push_back("libpng.a"); } - if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { + if (CONTAINS_DEFINE(setup.defines, "USE_OGG")) { frameworks_iOS.push_back("libogg.a"); + } + if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) { frameworks_iOS.push_back("libvorbis.a"); frameworks_iOS.push_back("libvorbisfile.a"); } + if (CONTAINS_DEFINE(setup.defines, "USE_TREMOR")) { + frameworks_iOS.push_back("libvorbisidec.a"); + } if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { frameworks_iOS.push_back("libtheoradec.a"); } @@ -632,11 +642,16 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) { frameworks_osx.push_back("libpng.a"); } - if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { + if (CONTAINS_DEFINE(setup.defines, "USE_OGG")) { frameworks_osx.push_back("libogg.a"); + } + if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) { frameworks_osx.push_back("libvorbis.a"); frameworks_osx.push_back("libvorbisfile.a"); } + if (CONTAINS_DEFINE(setup.defines, "USE_TREMOR")) { + frameworks_osx.push_back("libvorbisidec.a"); + } if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) { frameworks_osx.push_back("libtheoradec.a"); } |