moved tga code into utils

include/tga.h → include/utils/tga.h

@@ -1,5 +1,5 @@
 /*!
- * \file include/tga.h
+ * \file include/utils/tga.h
  * \brief TGA image reader/writer
  *
  * \author Mongoose

src/CMakeLists.txt

@@ -1,25 +1,24 @@
 # Set Source files
-set (SRCS ${SRCS} Camera.cpp)
-set (SRCS ${SRCS} Emitter.cpp)
-set (SRCS ${SRCS} GLString.cpp)
-set (SRCS ${SRCS} MatMath.cpp)
-set (SRCS ${SRCS} Matrix.cpp)
-set (SRCS ${SRCS} Mesh.cpp)
-set (SRCS ${SRCS} Network.cpp)
-set (SRCS ${SRCS} OpenRaider.cpp)
-set (SRCS ${SRCS} Particle.cpp)
-set (SRCS ${SRCS} Quaternion.cpp)
-set (SRCS ${SRCS} Render.cpp)
-set (SRCS ${SRCS} SDLSystem.cpp)
-set (SRCS ${SRCS} SkeletalModel.cpp)
-set (SRCS ${SRCS} Sound.cpp)
-set (SRCS ${SRCS} System.cpp)
-set (SRCS ${SRCS} Texture.cpp)
-set (SRCS ${SRCS} TombRaider.cpp)
-set (SRCS ${SRCS} Vector3d.cpp)
-set (SRCS ${SRCS} ViewVolume.cpp)
-set (SRCS ${SRCS} World.cpp)
-set (SRCS ${SRCS} tga.cpp)
+set (SRCS ${SRCS} "Camera.cpp")
+set (SRCS ${SRCS} "Emitter.cpp")
+set (SRCS ${SRCS} "GLString.cpp")
+set (SRCS ${SRCS} "MatMath.cpp")
+set (SRCS ${SRCS} "Matrix.cpp")
+set (SRCS ${SRCS} "Mesh.cpp")
+set (SRCS ${SRCS} "Network.cpp")
+set (SRCS ${SRCS} "OpenRaider.cpp")
+set (SRCS ${SRCS} "Particle.cpp")
+set (SRCS ${SRCS} "Quaternion.cpp")
+set (SRCS ${SRCS} "Render.cpp")
+set (SRCS ${SRCS} "SDLSystem.cpp")
+set (SRCS ${SRCS} "SkeletalModel.cpp")
+set (SRCS ${SRCS} "Sound.cpp")
+set (SRCS ${SRCS} "System.cpp")
+set (SRCS ${SRCS} "Texture.cpp")
+set (SRCS ${SRCS} "TombRaider.cpp")
+set (SRCS ${SRCS} "Vector3d.cpp")
+set (SRCS ${SRCS} "ViewVolume.cpp")
+set (SRCS ${SRCS} "World.cpp")
 
 #################################################################
 

src/Texture.cpp

@@ -20,7 +20,7 @@
 #include <GL/glu.h>
 #endif
 
-#include "TGA.h"
+#include "utils/tga.h"
 #include "Texture.h"
 
 //Texture *gTextureManager = 0x0;

src/TombRaider.cpp

@@ -16,7 +16,7 @@
 #include "TombRaider.h"
 
 #ifdef __TEST_TR5_DUMP_TGA
-#include "TGA.h"
+#include "utils/tga.h"
 #endif
 
 TombRaider::TombRaider()

src/utils/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Source files
 set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
+set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
 
 # Include directory
 include_directories ("${PROJECT_SOURCE_DIR}/include")

src/tga.cpp → src/utils/tga.cpp

@@ -1,5 +1,5 @@
 /*!
- * \file src/tga.cpp
+ * \file src/utils/tga.cpp
  * \brief TGA image reader/writer
  *
  * \todo type should pass more info (2 bits for RGBA|RGB|GREY; val for depth)
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "TGA.h"
+#include "utils/tga.h"
 
 int tga_check(FILE *f) {
     char buffer[10];

test/CMakeLists.txt

@@ -22,7 +22,7 @@ set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUNIT_TEST")
 #################################################################
 
 # TGA Test
-set (TGASRCS "${PROJECT_SOURCE_DIR}/test/tga.cpp" "${PROJECT_SOURCE_DIR}/src/tga.cpp")
+set (TGASRCS "${PROJECT_SOURCE_DIR}/test/tga.cpp" "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp")
 add_executable (TGATest EXCLUDE_FROM_ALL ${TGASRCS})
 set_target_properties (TGATest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
 
@@ -93,7 +93,7 @@ set (GLLIBS ${GLLIBS} ${OPENGL_LIBRARIES})
 
 # GLString Test
 set (GLSTRINGSRCS "${PROJECT_SOURCE_DIR}/test/GLString.cpp" "${PROJECT_SOURCE_DIR}/src/GLString.cpp")
-set (GLSTRINGSRCS ${GLSTRINGSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp" "${PROJECT_SOURCE_DIR}/src/Texture.cpp")
+set (GLSTRINGSRCS ${GLSTRINGSRCS} "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp" "${PROJECT_SOURCE_DIR}/src/Texture.cpp")
 add_executable (GLStringTest EXCLUDE_FROM_ALL ${GLSTRINGSRCS})
 set_target_properties (GLStringTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
 target_link_libraries (GLStringTest m ${GLLIBS})
@@ -108,7 +108,7 @@ set (ZLIBS ${ZLIBS} ${ZLIB_LIBRARIES})
 # TombRaider Test
 set (TOMB_FLAGS "-D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES")
 set (TOMBSRCS "${PROJECT_SOURCE_DIR}/test/TombRaider.cpp" "${PROJECT_SOURCE_DIR}/src/TombRaider.cpp")
-set (TOMBSRCS ${TOMBSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp")
+set (TOMBSRCS ${TOMBSRCS} "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp")
 add_executable (TombRaiderTest EXCLUDE_FROM_ALL ${TOMBSRCS})
 set_target_properties (TombRaiderTest PROPERTIES COMPILE_FLAGS "${OpenRaider_CXX_FLAGS} ${TOMB_FLAGS}")
 target_link_libraries (TombRaiderTest ${ZLIBS})

test/TombRaider.cpp

@@ -53,7 +53,7 @@
 #include <TombRaider.h>
 
 #ifdef __TEST_TR5_DUMP_TGA
-#include <TGA.h>
+#include <utils/tga.h>
 #endif
 
 #ifdef DEBUG_MEMORY

test/tga.cpp

@@ -6,7 +6,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <TGA.h>
+#include <utils/tga.h>
 #include "greatest.h"
 
 //! \todo generate list?