Cleanup: Moved files to libdoomsday

skyjake · Jul 17, 2020 · 40b7b41 · 40b7b41
1 parent 0852dd2
commit 40b7b41
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 19 deletions.
diff --git a/doomsday/apps/client/include/gl/gl_tex.h b/doomsday/apps/client/include/gl/gl_tex.h
@@ -25,8 +25,7 @@
 #ifndef DE_GL_IMAGE_MANIPULATION_H
 #define DE_GL_IMAGE_MANIPULATION_H
 
-#include "misc/color.h"
-
+#include <doomsday/color.h>
 #include <doomsday/res/colorpalette.h>
 
 typedef struct colorpalette_analysis_s {

diff --git a/doomsday/apps/client/src/gl/gl_tex.cpp b/doomsday/apps/client/src/gl/gl_tex.cpp
@@ -20,12 +20,11 @@
 #include "de_platform.h"
 #include "gl/gl_tex.h"
 #include "dd_main.h"
-
-#include "misc/color.h"
 #include "render/r_main.h"
 #include "resource/clientresources.h"
 #include "gl/sys_opengl.h"
 
+#include <doomsday/color.h>
 #include <doomsday/res/colorpalette.h>
 #include <de/legacy/memory.h>
 #include <de/legacy/memoryzone.h>

diff --git a/doomsday/apps/client/src/render/rendpoly.cpp b/doomsday/apps/client/src/render/rendpoly.cpp
@@ -20,9 +20,8 @@
 
 #include "de_base.h"
 #include "render/rendpoly.h"
-
-#include "misc/color.h"
 #include "render/walledge.h"
+#include <doomsday/color.h>
 
 using namespace de;
 

diff --git a/doomsday/apps/client/src/resource/framemodel.cpp b/doomsday/apps/client/src/resource/framemodel.cpp
@@ -135,7 +135,7 @@ static void *allocAndLoad(FileHandle &file, int offset, int len)
 // Precalculated normal LUT for use when loading MD2/DMD format models.
 #define NUMVERTEXNORMALS 162
 static float avertexnormals[NUMVERTEXNORMALS][3] = {
-#include "misc/tab_anorms.h"
+#include <doomsday/tab_anorms.h>
 };
 
 /**

diff --git a/doomsday/apps/server/CMakeLists.txt b/doomsday/apps/server/CMakeLists.txt
@@ -33,9 +33,7 @@ set (SHARED_WITH_CLIENT
     ${src}/include/de_base.h
     ${src}/include/de_platform.h
     ${src}/include/edit_map.h
-    ${src}/include/misc/color.h
     ${src}/include/misc/r_util.h
-    ${src}/include/misc/tab_anorms.h
     ${src}/include/m_profiler.h
     ${src}/include/network/net_buf.h
     ${src}/include/network/net_event.h

diff --git a/doomsday/apps/client/include/misc/color.h → ...ay/libs/doomsday/include/doomsday/color.h b/doomsday/apps/client/include/misc/color.h → ...ay/libs/doomsday/include/doomsday/color.h
@@ -1,7 +1,8 @@
 /**
  * @file color.h Color
  *
- * @author Copyright &copy; 2007-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright &copy; 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright &copy; 2007-2013 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -18,8 +19,9 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef DE_DATA_COLOR_H
-#define DE_DATA_COLOR_H
+#pragma once
+
+#include "libdoomsday.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,7 +34,7 @@ extern "C" {
  *
  * @ingroup data
  */
-typedef struct ColorRawf_s {
+typedef struct LIBDOOMSDAY_PUBLIC ColorRawf_s {
     union {
         // Straight RGBA vector representation.
         float rgba[4];
@@ -55,11 +57,9 @@ typedef struct ColorRawf_s {
 #endif
 } ColorRawf;
 
-float ColorRawf_AverageColor(ColorRawf* color);
-float ColorRawf_AverageColorMulAlpha(ColorRawf* color);
+LIBDOOMSDAY_PUBLIC float ColorRawf_AverageColor(ColorRawf* color);
+LIBDOOMSDAY_PUBLIC float ColorRawf_AverageColorMulAlpha(ColorRawf* color);
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
-
-#endif // DE_DATA_COLOR_H
diff --git a/...day/apps/client/include/misc/tab_anorms.h → ...bs/doomsday/include/doomsday/tab_anorms.h b/...day/apps/client/include/misc/tab_anorms.h → ...bs/doomsday/include/doomsday/tab_anorms.h
diff --git a/doomsday/apps/client/src/misc/color.cpp → doomsday/libs/doomsday/src/color.cpp b/doomsday/apps/client/src/misc/color.cpp → doomsday/libs/doomsday/src/color.cpp
@@ -1,5 +1,6 @@
 /** @file color.cpp Color
  *
+ * @authors Copyright &copy; 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright &copy; 2007-2013 Daniel Swanson <danij@dengine.net>
  *
  * @par License
@@ -17,8 +18,7 @@
  * 02110-1301 USA</small>
  */
 
-#include "de_platform.h"
-#include "misc/color.h"
+#include "doomsday/color.h"
 
 float ColorRawf_AverageColor(ColorRawf* c)
 {