Merge pull request #543 from and3md/fix_no_opengl

Allow disable OpenGL when you choose backend.
This commit is contained in:
Vadim Lopatin 2018-01-29 08:10:39 +03:00 committed by GitHub
commit 978790b8f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions

View File

@ -44,11 +44,15 @@ version(USE_CONSOLE) {
// provide default configuratino definitions // provide default configuratino definitions
version (USE_SDL) { version (USE_SDL) {
// SDL backend already selected using version identifier // SDL backend already selected using version identifier
version (NO_OPENGL) {
enum ENABLE_OPENGL = false;
} else {
version (USE_OPENGL) { version (USE_OPENGL) {
enum ENABLE_OPENGL = true; enum ENABLE_OPENGL = true;
} else { } else {
enum ENABLE_OPENGL = false; enum ENABLE_OPENGL = false;
} }
}
enum BACKEND_SDL = true; enum BACKEND_SDL = true;
enum BACKEND_X11 = false; enum BACKEND_X11 = false;
enum BACKEND_DSFML = false; enum BACKEND_DSFML = false;
@ -70,11 +74,15 @@ version(USE_CONSOLE) {
enum BACKEND_CONSOLE = false; enum BACKEND_CONSOLE = false;
} else version (USE_X11) { } else version (USE_X11) {
// X11 backend already selected using version identifier // X11 backend already selected using version identifier
version (NO_OPENGL) {
enum ENABLE_OPENGL = false;
} else {
version (USE_OPENGL) { version (USE_OPENGL) {
enum ENABLE_OPENGL = true; enum ENABLE_OPENGL = true;
} else { } else {
enum ENABLE_OPENGL = false; enum ENABLE_OPENGL = false;
} }
}
enum BACKEND_SDL = false; enum BACKEND_SDL = false;
enum BACKEND_X11 = true; enum BACKEND_X11 = true;
enum BACKEND_DSFML = false; enum BACKEND_DSFML = false;
@ -82,11 +90,15 @@ version(USE_CONSOLE) {
enum BACKEND_CONSOLE = false; enum BACKEND_CONSOLE = false;
} else version (USE_WIN32) { } else version (USE_WIN32) {
// Win32 backend already selected using version identifier // Win32 backend already selected using version identifier
version (NO_OPENGL) {
enum ENABLE_OPENGL = false;
} else {
version (USE_OPENGL) { version (USE_OPENGL) {
enum ENABLE_OPENGL = true; enum ENABLE_OPENGL = true;
} else { } else {
enum ENABLE_OPENGL = false; enum ENABLE_OPENGL = false;
} }
}
enum BACKEND_SDL = false; enum BACKEND_SDL = false;
enum BACKEND_X11 = false; enum BACKEND_X11 = false;
enum BACKEND_DSFML = false; enum BACKEND_DSFML = false;