Split the header block from the crn_decomp.h into a separate crn_defs.h file. This change makes the used CRND_HEADER_FILE_ONLY macro unneccesary.

crnlib/crn_comp.h

@@ -2,9 +2,7 @@
 // See Copyright Notice and license at the end of inc/crnlib.h
 #pragma once
 
-#define CRND_HEADER_FILE_ONLY
-#include "../inc/crn_decomp.h"
-#undef CRND_HEADER_FILE_ONLY
+#include "../inc/crn_defs.h"
 
 #include "../inc/crnlib.h"
 #include "crn_symbol_codec.h"

crnlib/crn_mipmapped_texture.cpp

@@ -8,8 +8,7 @@
 #include "crn_texture_comp.h"
 #include "crn_ktx_texture.h"
 
-#define CRND_HEADER_FILE_ONLY
-#include "../inc/crn_decomp.h"
+#include "../inc/crn_defs.h"
 
 namespace crnlib {
 const vec2I g_vertical_cross_image_offsets[6] = {vec2I(2, 1), vec2I(0, 1), vec2I(1, 0), vec2I(1, 2), vec2I(1, 1), vec2I(1, 3)};

crnlib/crnlib.2010.vcxproj

@@ -544,6 +544,7 @@
     <ClInclude Include="crn_texture_conversion.h" />
     <ClInclude Include="crn_texture_file_types.h" />
     <ClInclude Include="..\inc\crn_decomp.h" />
+    <ClInclude Include="..\inc\crn_defs.h" />
     <ClInclude Include="..\inc\crnlib.h" />
     <ClInclude Include="..\inc\dds_defs.h" />
     <ClInclude Include="crn_file_utils.h" />

crnlib/crnlib.2010.vcxproj.filters

@@ -576,6 +576,9 @@
     <ClInclude Include="..\inc\crn_decomp.h">
       <Filter>Source Files\inc</Filter>
     </ClInclude>
+    <ClInclude Include="..\inc\crn_defs.h">
+      <Filter>Source Files\inc</Filter>
+    </ClInclude>
     <ClInclude Include="..\inc\crnlib.h">
       <Filter>Source Files\inc</Filter>
     </ClInclude>

crnlib/crnlib.cbp

@@ -226,6 +226,7 @@
 		<Unit filename="lzma_Threads.h" />
 		<Unit filename="lzma_Types.h" />
 		<Unit filename="..\inc\crn_decomp.h" />
+		<Unit filename="..\inc\crn_defs.h" />
 		<Unit filename="..\inc\crnlib.h" />
 		<Unit filename="..\inc\dds_defs.h" />
 		<Extensions>

crnlib/crnlib.cpp

@@ -9,8 +9,7 @@
 #include "crn_ryg_dxt.hpp"
 #include "crn_etc.h"
 
-#define CRND_HEADER_FILE_ONLY
-#include "../inc/crn_decomp.h"
+#include "../inc/crn_defs.h"
 
 #include "crn_rg_etc1.h"
 

crnlib/crnlib_linux.cbp

@@ -224,6 +224,7 @@
 		<Unit filename="lzma_Threads.h" />
 		<Unit filename="lzma_Types.h" />
 		<Unit filename="../inc/crn_decomp.h" />
+		<Unit filename="../inc/crn_defs.h" />
 		<Unit filename="../inc/crnlib.h" />
 		<Unit filename="../inc/dds_defs.h" />
 		<Extensions>