diff options
| author | Johannes Schickel | 2016-03-23 15:55:55 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-23 15:55:55 +0100 |
| commit | 114ef5817fe661275f7cb99d490b72f1d287b30e (patch) | |
| tree | fe107ea3b10a8d38d1db01ebe1082c73616b96f0 /devtools/create_project | |
| parent | 949af0fa7d5688c693b7a8201ac8b92aee95d274 (diff) | |
| parent | 6b2424b6353ca5712afdf80e128a912a3cf78f0c (diff) | |
| download | scummvm-rg350-114ef5817fe661275f7cb99d490b72f1d287b30e.tar.gz scummvm-rg350-114ef5817fe661275f7cb99d490b72f1d287b30e.tar.bz2 scummvm-rg350-114ef5817fe661275f7cb99d490b72f1d287b30e.zip | |
Merge pull request #711 from lordhoto/opengl-revamp
OpenGLGraphicsManager: Revamp
Diffstat (limited to 'devtools/create_project')
| -rw-r--r-- | devtools/create_project/create_project.cpp | 3 | ||||
| -rw-r--r-- | devtools/create_project/xcode.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index aa450f1461..adfe75c624 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -954,7 +954,8 @@ const Feature s_features[] = { { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. - { "opengl", "USE_OPENGL", "opengl32", true, "OpenGL support" }, + { "opengl", "USE_OPENGL", "", true, "OpenGL support" }, + { "opengles", "USE_GLES", "", true, "forced OpenGL ES mode" }, { "taskbar", "USE_TASKBAR", "", true, "Taskbar integration support" }, { "translation", "USE_TRANSLATION", "", true, "Translation support" }, { "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"}, diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index a43730fbe2..ac7a1d0617 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -447,9 +447,6 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { DEF_SYSFRAMEWORK("UIKit"); DEF_SYSTBD("libiconv"); - // Optionals: - DEF_SYSFRAMEWORK("OpenGL"); - // Local libraries DEF_LOCALLIB_STATIC("libFLAC"); DEF_LOCALLIB_STATIC("libmad"); @@ -570,8 +567,6 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) { frameworks_osx.push_back("IOKit.framework"); frameworks_osx.push_back("Cocoa.framework"); frameworks_osx.push_back("AudioUnit.framework"); - // Optionals: - frameworks_osx.push_back("OpenGL.framework"); order = 0; for (ValueList::iterator framework = frameworks_osx.begin(); framework != frameworks_osx.end(); framework++) { |