diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-05-01 12:14:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-01 12:14:50 +0300 |
commit | 7ded7610ce53c9bc8b571332589105dfb86a89c1 (patch) | |
tree | ed569289596dc9293a6980680e22904bbf9705d9 /intern | |
parent | 47fea20dc870d72d03f0e0babd7aec21b73315ff (diff) |
Cleanup: rename WITH_X11 to WITH_GHOST_X11
Matches WITH_GHOST_{SDL|WAYLAND}
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/CMakeLists.txt | 10 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ISystem.cpp | 8 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_IXrGraphicsBinding.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrGraphicsBinding.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Xr_openxr_includes.h | 2 | ||||
-rw-r--r-- | intern/ghost/test/CMakeLists.txt | 3 |
6 files changed, 16 insertions, 15 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 3ba6c5d48c7..7620bd43630 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -149,7 +149,7 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL) endif() endif() -elseif(APPLE AND NOT WITH_X11) +elseif(APPLE AND NOT WITH_GHOST_X11) list(APPEND SRC intern/GHOST_DisplayManagerCocoa.mm intern/GHOST_SystemCocoa.mm @@ -177,8 +177,8 @@ elseif(APPLE AND NOT WITH_X11) ) endif() -elseif(WITH_X11 OR WITH_GHOST_WAYLAND) - if(WITH_X11) +elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) + if(WITH_GHOST_X11) list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH} ) @@ -254,7 +254,7 @@ elseif(WITH_X11 OR WITH_GHOST_WAYLAND) ) endif() - add_definitions(-DWITH_X11) + add_definitions(-DWITH_GHOST_X11) endif() if(WITH_GHOST_WAYLAND) @@ -335,7 +335,7 @@ elseif(WITH_X11 OR WITH_GHOST_WAYLAND) ) endif() - add_definitions(-DWITH_X11) + add_definitions(-DWITH_GHOST_X11) elseif(WIN32) # # Warnings as errors, this is too strict! diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index 8041f7758d8..11d1c501d04 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -27,8 +27,8 @@ #include "GHOST_ISystem.h" -#if defined(WITH_X11) || defined(WITH_GHOST_WAYLAND) -# ifdef WITH_X11 +#if defined(WITH_GHOST_X11) || defined(WITH_GHOST_WAYLAND) +# ifdef WITH_GHOST_X11 # include "GHOST_SystemX11.h" # endif # ifdef WITH_GHOST_WAYLAND @@ -54,7 +54,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem() { GHOST_TSuccess success; if (!m_system) { -#if defined(WITH_X11) || defined(WITH_GHOST_WAYLAND) +#if defined(WITH_GHOST_X11) || defined(WITH_GHOST_WAYLAND) # ifdef WITH_GHOST_WAYLAND try { m_system = new GHOST_SystemWayland(); @@ -62,7 +62,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem() catch (const std::exception &) { } # endif -# ifdef WITH_X11 +# ifdef WITH_GHOST_X11 if (!m_system) { m_system = new GHOST_SystemX11(); } diff --git a/intern/ghost/intern/GHOST_IXrGraphicsBinding.h b/intern/ghost/intern/GHOST_IXrGraphicsBinding.h index cddb557d163..5794a682023 100644 --- a/intern/ghost/intern/GHOST_IXrGraphicsBinding.h +++ b/intern/ghost/intern/GHOST_IXrGraphicsBinding.h @@ -33,7 +33,7 @@ class GHOST_IXrGraphicsBinding { public: union { -#if defined(WITH_X11) +#if defined(WITH_GHOST_X11) XrGraphicsBindingOpenGLXlibKHR glx; #elif defined(WIN32) XrGraphicsBindingOpenGLWin32KHR wgl; diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp index 60b3b06f6a8..5e30502f7ff 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp +++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp @@ -22,7 +22,7 @@ #include <list> #include <sstream> -#if defined(WITH_X11) +#if defined(WITH_GHOST_X11) # include "GHOST_ContextGLX.h" #elif defined(WIN32) # include "GHOST_ContextD3D.h" @@ -68,7 +68,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding { XrSystemId system_id, std::string *r_requirement_info) const override { -#if defined(WITH_X11) +#if defined(WITH_GHOST_X11) GHOST_ContextGLX *ctx_gl = static_cast<GHOST_ContextGLX *>(ghost_ctx); #else GHOST_ContextWGL *ctx_gl = static_cast<GHOST_ContextWGL *>(ghost_ctx); @@ -107,7 +107,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding { void initFromGhostContext(GHOST_Context *ghost_ctx) override { -#if defined(WITH_X11) +#if defined(WITH_GHOST_X11) GHOST_ContextGLX *ctx_glx = static_cast<GHOST_ContextGLX *>(ghost_ctx); XVisualInfo *visual_info = glXGetVisualFromFBConfig(ctx_glx->m_display, ctx_glx->m_fbconfig); diff --git a/intern/ghost/intern/GHOST_Xr_openxr_includes.h b/intern/ghost/intern/GHOST_Xr_openxr_includes.h index 925d6037750..9cac43b1549 100644 --- a/intern/ghost/intern/GHOST_Xr_openxr_includes.h +++ b/intern/ghost/intern/GHOST_Xr_openxr_includes.h @@ -42,7 +42,7 @@ #ifdef XR_USE_GRAPHICS_API_D3D12 # include <d3d12.h> #endif -#ifdef WITH_X11 +#ifdef WITH_GHOST_X11 # include <GL/glxew.h> #endif diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index eda41eb9c1a..b6e3c0ecf5f 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -85,8 +85,9 @@ endif() # Libraries if(UNIX AND NOT APPLE) - set(WITH_X11 ON) + set(WITH_GHOST_X11 ON) endif() + # for now... default to this add_definitions(-DWITH_GL_PROFILE_COMPAT) # BLF needs this to ignore GPU library |