cmake EGL stuff

friction2d · Dec 29, 2024 · d6e5ad4 · d6e5ad4
1 parent 9669e7a
commit d6e5ad4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -33,7 +33,6 @@ include(friction-ffmpeg)
 add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}")
 
 if(${LINUX_DEPLOY})
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
     set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
 endif()
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -38,6 +38,13 @@ add_definitions(-DPROJECT_BRANCH="${GIT_BRANCH}")
 
 add_definitions(-DCORE_LIBRARY)
 
+if(UNIX AND NOT APPLE)
+    option(USE_EGL "Use EGL" OFF)
+    if(${USE_EGL})
+        add_definitions(-DFRICTION_EGL)
+    endif()
+endif()
+
 include_directories(
     #${QUAZIP_INCLUDE_DIRS}
     ${FFMPEG_INCLUDE_DIRS}

diff --git a/src/core/appsupport.cpp b/src/core/appsupport.cpp
@@ -988,7 +988,7 @@ void AppSupport::initEnv(const bool &isRenderer)
     if (registry.value("AppsUseLightTheme", 0).toInt() == 0) { qputenv("QT_QPA_PLATFORM", "windows:darkmode=1"); }
 #endif
 #elif defined(Q_OS_LINUX)
-#ifdef PROJECT_OFFICIAL
+#ifndef FRICTION_EGL
     qputenv("QT_QPA_PLATFORM", "xcb");
 #endif
 #endif

diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -30,7 +30,7 @@ option(MAC_DEPLOY "Mac Deploy" OFF)
 option(SYNC_SKIA_DEPS "Sync third-party depends" ON)
 
 if(UNIX AND NOT APPLE)
-    option(USE_EGL "Use EGL in skia" OFF)
+    option(USE_EGL "Use EGL" OFF)
 endif()
 
 set(SKIA_SRC "${CMAKE_CURRENT_SOURCE_DIR}/skia")