diff options
| author | Johannes Schickel | 2015-12-12 01:18:46 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-16 20:29:24 +0100 |
| commit | 4a781737c1da77015df4547f64f2f88966816343 (patch) | |
| tree | 399778283ddf76798960e47485565b29afbd5fe9 /devtools/create_project | |
| parent | b3b3d37e3b8231ec345a2d4172279373d53a0c79 (diff) | |
| download | scummvm-rg350-4a781737c1da77015df4547f64f2f88966816343.tar.gz scummvm-rg350-4a781737c1da77015df4547f64f2f88966816343.tar.bz2 scummvm-rg350-4a781737c1da77015df4547f64f2f88966816343.zip | |
OPENGL: Resolve OpenGL functions on run-time.
Formerly we relied on static linkage. However, in the presense of modern
OpenGL (ES) implementations it is not easily identifable which library to link
against. For example, on Linux amd64 with nVidia drivers and SDL2 setup to
create a GLES 1.1 context one would need to link against libGL.so. However,
traditionally GLES 1.1 required to link against libGLESv1_CM.so. To prevent a
huge mess we simply resolve the OpenGL functions on run-time now and stop
linking against a static library (in most cases).
GLES support needs to be enabled manually on configure time for now.
Tizen changes have NOT been tested.
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++) { |