From 10bdaaec062dcabfe134da3a487db40438b799be Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Tue, 7 Aug 2018 11:45:26 +0200
Subject: [PATCH] Move stb_image_write.h into vid. It's used there, only.

---
 CMakeLists.txt                                                | 4 +---
 Makefile                                                      | 4 ++--
 src/{backends/generic => client/vid}/header/stb_image_write.h | 0
 src/client/vid/vid.c                                          | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename src/{backends/generic => client/vid}/header/stb_image_write.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 326c166a..2508f8b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,6 @@ set(Backends-Generic-Source
 	)
 
 set(Backends-Unix-Source
-	${BACKENDS_SRC_DIR}/generic/misc.c
 	${BACKENDS_SRC_DIR}/unix/main.c
 	${BACKENDS_SRC_DIR}/unix/network.c
 	${BACKENDS_SRC_DIR}/unix/signalhandler.c
@@ -363,6 +362,7 @@ set(Client-Header
 	${CLIENT_SRC_DIR}/sound/header/sound.h
 	${CLIENT_SRC_DIR}/sound/header/vorbis.h
 	${CLIENT_SRC_DIR}/vid/header/ref.h
+	${CLIENT_SRC_DIR}/vid/header/stb_image_write.h
 	${CLIENT_SRC_DIR}/vid/header/vid.h
 	${COMMON_SRC_DIR}/header/common.h
 	${COMMON_SRC_DIR}/header/crc.h
@@ -452,7 +452,6 @@ set(GL1-Header
 	${REF_SRC_DIR}/gl1/header/local.h
 	${REF_SRC_DIR}/gl1/header/model.h
 	${REF_SRC_DIR}/gl1/header/qgl.h
-	${BACKENDS_SRC_DIR}/generic/header/stb_image_write.h
 	${COMMON_SRC_DIR}/header/shared.h
 	)
 
@@ -492,7 +491,6 @@ set(GL3-Header
 	${REF_SRC_DIR}/gl3/header/HandmadeMath.h
 	${REF_SRC_DIR}/gl3/header/local.h
 	${REF_SRC_DIR}/gl3/header/model.h
-	${BACKENDS_SRC_DIR}/generic/header/stb_image_write.h
 	${COMMON_SRC_DIR}/header/shared.h
 	)
 
diff --git a/Makefile b/Makefile
index e52bb4fe..a78e629a 100755
--- a/Makefile
+++ b/Makefile
@@ -871,6 +871,7 @@ endif
 
 # Used by the server
 SERVER_OBJS_ := \
+	src/backends/generic/misc.o \
 	src/common/argproc.o \
 	src/common/clientserver.o \
 	src/common/collision.o \
@@ -899,8 +900,7 @@ SERVER_OBJS_ := \
 	src/server/sv_save.o \
 	src/server/sv_send.o \
 	src/server/sv_user.o \
-	src/server/sv_world.o \
-	src/backends/generic/misc.o
+	src/server/sv_world.o
 
 ifeq ($(YQ2_OSTYPE), Windows)
 SERVER_OBJS_ += \
diff --git a/src/backends/generic/header/stb_image_write.h b/src/client/vid/header/stb_image_write.h
similarity index 100%
rename from src/backends/generic/header/stb_image_write.h
rename to src/client/vid/header/stb_image_write.h
diff --git a/src/client/vid/vid.c b/src/client/vid/vid.c
index a89741ee..37917a76 100644
--- a/src/client/vid/vid.c
+++ b/src/client/vid/vid.c
@@ -67,7 +67,7 @@ compress_for_stbiw(unsigned char *data, int data_len, int *out_len, int quality)
 #endif
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "../../backends/generic/header/stb_image_write.h"
+#include "header/stb_image_write.h"
 
 /*
  * Writes a screenshot. This function is called with raw image data of