From 82519b43c1ca11c60f6c8fab51e7365b2a8ad767 Mon Sep 17 00:00:00 2001
From: kj16609 <bigskyman02@gmail.com>
Date: Mon, 29 Sep 2025 11:11:34 -0400
Subject: [PATCH] Fixes X11 issues

---
 cmake_modules/dependencies/blurhash.cmake |  2 --
 cmake_modules/dependencies/glfw.cmake     | 20 ++++++++------------
 cmake_modules/dependencies/gtest.cmake    | 11 -----------
 cmake_modules/dependencies/lz4.cmake      | 11 -----------
 cmake_modules/dependencies/qt.cmake       | 13 -------------
 src/editor/CMakeLists.txt                 |  2 +-
 6 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 cmake_modules/dependencies/blurhash.cmake
 delete mode 100644 cmake_modules/dependencies/gtest.cmake
 delete mode 100644 cmake_modules/dependencies/lz4.cmake
 delete mode 100644 cmake_modules/dependencies/qt.cmake

diff --git a/cmake_modules/dependencies/blurhash.cmake b/cmake_modules/dependencies/blurhash.cmake
deleted file mode 100644
index 4f23ec7..0000000
--- a/cmake_modules/dependencies/blurhash.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/blurhash)
-set_target_properties(BlurhashCXX PROPERTIES COMPILE_FLAGS ${FGL_FLAGS})
\ No newline at end of file
diff --git a/cmake_modules/dependencies/glfw.cmake b/cmake_modules/dependencies/glfw.cmake
index c9abe48..3022dc3 100644
--- a/cmake_modules/dependencies/glfw.cmake
+++ b/cmake_modules/dependencies/glfw.cmake
@@ -3,18 +3,14 @@
 set(GLFW_BUILD_X11 ON)
 set(GLFW_BUILD_WAYLAND OFF)
 
-#if (WIN32)
-	if (DEFINED ENV{GLFW_PATH})
-		message("-- GLFW_PATH defined as: $ENV{GLFW_PATH}.")
-		list(APPEND CMAKE_PREFIX_PATH $ENV{GLFW_PATH})
-		find_package(glfw3 REQUIRED)
-	else ()
-		message("-- GLFW_PATH not defined. Using submodule instead")
-		add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/glfw3)
-	endif ()
-#else ()
-#	find_package(glfw3 REQUIRED)
-#endif ()
+if (DEFINED ENV{GLFW_PATH})
+	message("-- GLFW_PATH defined as: $ENV{GLFW_PATH}.")
+	list(APPEND CMAKE_PREFIX_PATH $ENV{GLFW_PATH})
+	find_package(glfw3 REQUIRED)
+else ()
+	message("-- GLFW_PATH not defined. Using submodule instead")
+	add_subdirectory(${CMAKE_SOURCE_DIR}/dependencies/glfw3)
+endif ()
 
 set(GLFW_BUILD_X11 ON)
 set(GLFW_BUILD_WAYLAND OFF)
diff --git a/cmake_modules/dependencies/gtest.cmake b/cmake_modules/dependencies/gtest.cmake
deleted file mode 100644
index bdb60af..0000000
--- a/cmake_modules/dependencies/gtest.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-include(FetchContent)
-include(FetchContent)
-FetchContent_Declare(
-		googletest
-		URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
-)
-# For Windows: Prevent overriding the parent project's compiler/linker settings
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-FetchContent_MakeAvailable(googletest)
\ No newline at end of file
diff --git a/cmake_modules/dependencies/lz4.cmake b/cmake_modules/dependencies/lz4.cmake
deleted file mode 100644
index 329fa60..0000000
--- a/cmake_modules/dependencies/lz4.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LZ4_DIR ${CMAKE_SOURCE_DIR}/dependencies/lz4/lib)
-
-file(GLOB_RECURSE LZ4_SOURCES ${LZ4_DIR}/*.c)
-
-add_library(lz4 STATIC ${LZ4_SOURCES})
-target_include_directories(lz4 PUBLIC ${LZ4_DIR})
-
-if (WIN32)
-	#target_compile_definitions(${CMAKE_SOURCE_DIR}/dependencies/lz4 PRIVATE UNICODE=1)
-	target_compile_definitions(lz4 PRIVATE LZ4_DEBUG=0)
-endif ()
\ No newline at end of file
diff --git a/cmake_modules/dependencies/qt.cmake b/cmake_modules/dependencies/qt.cmake
deleted file mode 100644
index 6421e6a..0000000
--- a/cmake_modules/dependencies/qt.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#Verify after setting QT_PATH
-if (DEFINED QT_PATH)
-	message("-- QT_PATH defined as ${QT_PATH}.")
-	list(APPEND CMAKE_PREFIX_PATH ${QT_PATH})
-else ()
-	message("-- QT_PATH not defined.")
-endif ()
-
-find_package(Qt6 COMPONENTS Widgets Core Concurrent Network Test Charts REQUIRED)
-
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
diff --git a/src/editor/CMakeLists.txt b/src/editor/CMakeLists.txt
index 05b285c..1bdeef2 100644
--- a/src/editor/CMakeLists.txt
+++ b/src/editor/CMakeLists.txt
@@ -14,4 +14,4 @@ AddFGLExecutable(TitorEditor ${CMAKE_CURRENT_SOURCE_DIR}/src)
 target_link_libraries(TitorEditor PRIVATE FGLEngine)
 target_compile_definitions(TitorEditor PUBLIC TITOR_EDITOR)
 target_compile_features(TitorEditor PRIVATE cxx_std_23)
-target_link_libraries(TitorEditor PRIVATE glfw ImGui)
+target_link_libraries(TitorEditor PRIVATE glfw ImGui X11)