Reorganizing fix library

CMakeLists.txt

@@ -145,6 +145,7 @@ endif()
 include_directories(
   "cfile"   # TODO: Remove after untying all modules
   "ddebug"  # -*-
+  "fix"     # -*-
   "lib"     # TODO: Remove after untying all modules
   "Descent3"
   ${PLATFORM_INCLUDES}

fix/CMakeLists.txt

@@ -3,3 +3,8 @@ set(CPPS
   fix.cpp)
 
 add_library(fix STATIC ${HEADERS} ${CPPS})
+target_include_directories(fix PUBLIC
+  $<BUILD_INTERFACE:
+  ${PROJECT_SOURCE_DIR}/fix
+  >
+)

fix/fix.h

@@ -61,7 +61,7 @@
 #ifndef _FIX_H
 #define _FIX_H
 
-#include "math.h"
+#include <cmath>
 
 // Disable the "possible loss of data" warning
 #pragma warning(disable : 4244)
@@ -112,7 +112,7 @@ fix FloatToFixFast(float num);
 
 // Fixed-point math functions in inline ASM form
 #if   defined(WIN32)
-#include "win\fixwin32.h"
+#include "fixwin32.h"
 #endif
 
 // use this instead of:

vecmat/CMakeLists.txt

@@ -3,3 +3,4 @@ set(CPPS
   vector.cpp)
 
 add_library(vecmat STATIC ${HEADERS} ${CPPS})
+target_link_libraries(vecmat fix)