From 6bba9bc25df25c33c473b242c668fcc53aac17c8 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Wed, 12 Jan 2022 12:22:18 +1100 Subject: [PATCH] [client/common] move ll from the client into the common code module --- client/CMakeLists.txt | 1 - client/renderers/EGL/model.c | 2 +- client/renderers/EGL/texture.h | 1 - client/renderers/OpenGL/opengl.c | 1 - client/src/app.c | 1 - client/src/clipboard.c | 1 - client/src/main.c | 1 - client/src/main.h | 1 + client/src/overlay/config.c | 1 - client/src/overlay/graphs.c | 1 - client/src/overlay/msg.c | 1 - common/CMakeLists.txt | 1 + {client/include => common/include/common}/ll.h | 0 {client => common}/src/ll.c | 3 +-- 14 files changed, 4 insertions(+), 12 deletions(-) rename {client/include => common/include/common}/ll.h (100%) rename {client => common}/src/ll.c (99%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 647e940a..ff3d4c37 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -125,7 +125,6 @@ set(SOURCES src/audio.c src/config.c src/keybind.c - src/ll.c src/util.c src/clipboard.c src/kb.c diff --git a/client/renderers/EGL/model.c b/client/renderers/EGL/model.c index 22df26af..b2473dbe 100644 --- a/client/renderers/EGL/model.c +++ b/client/renderers/EGL/model.c @@ -23,7 +23,7 @@ #include "texture.h" #include "common/debug.h" -#include "ll.h" +#include "common/ll.h" #include #include diff --git a/client/renderers/EGL/texture.h b/client/renderers/EGL/texture.h index 14690665..53d709b4 100644 --- a/client/renderers/EGL/texture.h +++ b/client/renderers/EGL/texture.h @@ -29,7 +29,6 @@ #include "common/types.h" #include "util.h" -#include "ll.h" #include #include diff --git a/client/renderers/OpenGL/opengl.c b/client/renderers/OpenGL/opengl.c index 4af8bdee..55857020 100644 --- a/client/renderers/OpenGL/opengl.c +++ b/client/renderers/OpenGL/opengl.c @@ -36,7 +36,6 @@ #include "common/framebuffer.h" #include "common/locking.h" #include "gl_dynprocs.h" -#include "ll.h" #include "util.h" #define BUFFER_COUNT 2 diff --git a/client/src/app.c b/client/src/app.c index 9d1c8973..6826e1c6 100644 --- a/client/src/app.c +++ b/client/src/app.c @@ -25,7 +25,6 @@ #include "util.h" #include "clipboard.h" -#include "ll.h" #include "kb.h" #include "common/debug.h" diff --git a/client/src/clipboard.c b/client/src/clipboard.c index 2cd1435b..e370c641 100644 --- a/client/src/clipboard.c +++ b/client/src/clipboard.c @@ -21,7 +21,6 @@ #include "clipboard.h" #include "main.h" -#include "ll.h" #include "common/debug.h" diff --git a/client/src/main.c b/client/src/main.c index 5140b39f..ec845913 100644 --- a/client/src/main.c +++ b/client/src/main.c @@ -57,7 +57,6 @@ #include "keybind.h" #include "clipboard.h" #include "kb.h" -#include "ll.h" #include "egl_dynprocs.h" #include "gl_dynprocs.h" #include "overlays.h" diff --git a/client/src/main.h b/client/src/main.h index 4ce59b72..2e5270ca 100644 --- a/client/src/main.h +++ b/client/src/main.h @@ -31,6 +31,7 @@ #include "common/locking.h" #include "common/ringbuffer.h" #include "common/event.h" +#include "common/ll.h" #include #include diff --git a/client/src/overlay/config.c b/client/src/overlay/config.c index 841b0754..29a5c6e8 100644 --- a/client/src/overlay/config.c +++ b/client/src/overlay/config.c @@ -21,7 +21,6 @@ #include "interface/overlay.h" #include "cimgui.h" #include "overlay_utils.h" -#include "ll.h" #include "../main.h" #include "../overlays.h" diff --git a/client/src/overlay/graphs.c b/client/src/overlay/graphs.c index c62a15ce..58a69094 100644 --- a/client/src/overlay/graphs.c +++ b/client/src/overlay/graphs.c @@ -23,7 +23,6 @@ #include "../main.h" -#include "ll.h" #include "common/debug.h" #include "overlay_utils.h" diff --git a/client/src/overlay/msg.c b/client/src/overlay/msg.c index 96c7f42f..ed0d328e 100644 --- a/client/src/overlay/msg.c +++ b/client/src/overlay/msg.c @@ -25,7 +25,6 @@ #include "common/stringutils.h" #include "common/stringlist.h" -#include "ll.h" #include "../main.h" diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index b756bb9f..50460354 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -35,6 +35,7 @@ set(COMMON_SOURCES src/vector.c src/cpuinfo.c src/debug.c + src/ll.c ) add_library(lg_common STATIC ${COMMON_SOURCES}) diff --git a/client/include/ll.h b/common/include/common/ll.h similarity index 100% rename from client/include/ll.h rename to common/include/common/ll.h diff --git a/client/src/ll.c b/common/src/ll.c similarity index 99% rename from client/src/ll.c rename to common/src/ll.c index 12e0baa1..4bca290d 100644 --- a/client/src/ll.c +++ b/common/src/ll.c @@ -18,8 +18,7 @@ * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ll.h" - +#include "common/ll.h" #include "common/debug.h" #include "common/locking.h" #include