From 8976973d3bab30a338743ca002ae6cbbe0661004 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Fri, 1 Aug 2025 20:32:04 +0100
Subject: [PATCH] Move puff.* to renderercommon

---
 Makefile                                | 11 ++++++-----
 code/{qcommon => renderercommon}/puff.c |  0
 code/{qcommon => renderercommon}/puff.h |  2 +-
 code/renderercommon/tr_image_png.c      |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename code/{qcommon => renderercommon}/puff.c (100%)
 rename code/{qcommon => renderercommon}/puff.h (94%)

diff --git a/Makefile b/Makefile
index 650ff338..76ee2fe7 100644
--- a/Makefile
+++ b/Makefile
@@ -1905,7 +1905,6 @@ Q3OBJ = \
   \
   $(B)/client/unzip.o \
   $(B)/client/ioapi.o \
-  $(B)/client/puff.o \
   $(B)/client/vm.o \
   $(B)/client/vm_interpreted.o \
   \
@@ -2006,7 +2005,9 @@ Q3R2OBJ = \
   $(B)/renderergl2/tr_world.o \
   \
   $(B)/renderergl1/sdl_gamma.o \
-  $(B)/renderergl1/sdl_glimp.o
+  $(B)/renderergl1/sdl_glimp.o \
+  \
+  $(B)/renderergl2/puff.o
 
 Q3R2STRINGOBJ = \
   $(B)/renderergl2/glsl/bokeh_fp.o \
@@ -2071,18 +2072,18 @@ Q3ROBJ = \
   $(B)/renderergl1/tr_world.o \
   \
   $(B)/renderergl1/sdl_gamma.o \
-  $(B)/renderergl1/sdl_glimp.o
+  $(B)/renderergl1/sdl_glimp.o \
+  \
+  $(B)/renderergl1/puff.o
 
 ifneq ($(USE_RENDERER_DLOPEN), 0)
   Q3ROBJ += \
     $(B)/renderergl1/q_shared.o \
-    $(B)/renderergl1/puff.o \
     $(B)/renderergl1/q_math.o \
     $(B)/renderergl1/tr_subs.o
 
   Q3R2OBJ += \
     $(B)/renderergl2/q_shared.o \
-    $(B)/renderergl2/puff.o \
     $(B)/renderergl2/q_math.o \
     $(B)/renderergl2/tr_subs.o
 endif
diff --git a/code/qcommon/puff.c b/code/renderercommon/puff.c
similarity index 100%
rename from code/qcommon/puff.c
rename to code/renderercommon/puff.c
diff --git a/code/qcommon/puff.h b/code/renderercommon/puff.h
similarity index 94%
rename from code/qcommon/puff.h
rename to code/renderercommon/puff.h
index 14070f64..2cfad676 100644
--- a/code/qcommon/puff.h
+++ b/code/renderercommon/puff.h
@@ -30,7 +30,7 @@
 #ifndef __PUFF_H
 #define __PUFF_H
 
-#include "q_shared.h"			/* for definitions of the <stdint.h> types */
+#include "../qcommon/q_shared.h"			/* for definitions of the <stdint.h> types */
 
 /*
  * See puff.c for purpose and usage.
diff --git a/code/renderercommon/tr_image_png.c b/code/renderercommon/tr_image_png.c
index 3ec8fdec..797f3cff 100644
--- a/code/renderercommon/tr_image_png.c
+++ b/code/renderercommon/tr_image_png.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "tr_common.h"
 
-#include "../qcommon/puff.h"
+#include "puff.h"
 
 // we could limit the png size to a lower value here
 #ifndef INT_MAX