From 0d0f1b3aa0bcfc548f00ab3c081c4119a6bec80f Mon Sep 17 00:00:00 2001
From: Rebekah Rowe <rebekahrowe9999@gmail.com>
Date: Mon, 4 Apr 2022 18:24:38 -0400
Subject: [PATCH] Removed extra CMakeLists and moved internal files to src
 folder

---
 include/CMakeLists.txt              | 4 ----
 include/internal/CMakeLists.txt     | 2 --
 src/CMakeLists.txt                  | 3 ---
 src/drawglx.c                       | 6 +-----
 {include/internal => src}/drawglx.h | 2 +-
 src/xoverlay.c                      | 2 +-
 6 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 include/CMakeLists.txt
 delete mode 100644 include/internal/CMakeLists.txt
 delete mode 100644 src/CMakeLists.txt
 rename {include/internal => src}/drawglx.h (100%)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
deleted file mode 100644
index a4abbe6..0000000
--- a/include/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-target_sources(xoverlay PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/xoverlay.h")
-        
-add_subdirectory(internal)
\ No newline at end of file
diff --git a/include/internal/CMakeLists.txt b/include/internal/CMakeLists.txt
deleted file mode 100644
index b348921..0000000
--- a/include/internal/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-target_sources(xoverlay PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/drawglx.h")
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index f158dce..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(xoverlay PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/drawglx.c"
-        "${CMAKE_CURRENT_LIST_DIR}/xoverlay.c")
\ No newline at end of file
diff --git a/src/drawglx.c b/src/drawglx.c
index b60f239..b816d49 100644
--- a/src/drawglx.c
+++ b/src/drawglx.c
@@ -5,11 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include "internal/drawglx.h"
-
-#include <GL/gl.h>
-#include <GL/glew.h>
-#include <GL/glx.h>
+#include "drawglx.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/shape.h>
diff --git a/include/internal/drawglx.h b/src/drawglx.h
similarity index 100%
rename from include/internal/drawglx.h
rename to src/drawglx.h
index fd4dab8..2dbb7b6 100644
--- a/include/internal/drawglx.h
+++ b/src/drawglx.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <GL/gl.h>
 #include <GL/glew.h>
+#include <GL/gl.h>
 #include <GL/glx.h>
 
 typedef struct
diff --git a/src/xoverlay.c b/src/xoverlay.c
index c976e9a..4b323ad 100644
--- a/src/xoverlay.c
+++ b/src/xoverlay.c
@@ -5,7 +5,7 @@
  *      Author: nullifiedcat
  */
 
-#include "internal/drawglx.h"
+#include "drawglx.h"
 
 #include <GL/glx.h>
 #include <X11/extensions/Xfixes.h>