Fix for incorrect usage of standart ints

Wrong code that did compile on a Windows but stopped compiling on a mac
madwareru · Jan 12, 2020 · ffa5815 · ffa5815
1 parent 75afee3
commit ffa5815
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,8 +16,6 @@ set (INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
-find_package(OpenGL REQUIRED)
-
 set(glew-cmake_BUILD_SHARED OFF CACHE BOOL "" FORCE)
 set(glew-cmake_BUILD_MULTI_CONTEXT OFF CACHE BOOL "" FORCE)
 set(glew-cmake_BUILD_STATIC ON CACHE BOOL "" FORCE)
@@ -41,8 +39,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 target_link_libraries(${PROJECT_NAME}
     glfw
     libglew_static
-    kaitai_struct_cpp_stl_runtime
-    opengl32)
+    kaitai_struct_cpp_stl_runtime)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
          CXX_STANDARD 17

diff --git a/include/graphics/Sprite16.h b/include/graphics/Sprite16.h
@@ -1,7 +1,8 @@
 #ifndef SPRITE_16_H_
 #define SPRITE_16_H_
 
-#include <cinttypes>
+#include <inttypes.h>
+#include <stddef.h>
 #include <vector>
 #include <tuple>
 

diff --git a/include/graphics/Sprite16a.h b/include/graphics/Sprite16a.h
@@ -1,7 +1,8 @@
 #ifndef SPRITE_16A_H_
 #define SPRITE_16A_H_
 
-#include <cinttypes>
+#include <inttypes.h>
+#include <stddef.h>
 #include <loaders/ksy/rage_of_mages_1_16a.h>
 
 struct SOASpriteRGB;

diff --git a/include/graphics/Sprite256.h b/include/graphics/Sprite256.h
@@ -1,7 +1,8 @@
 #ifndef SPRITE_256_H__
 #define SPRITE_256_H__
 
-#include <cinttypes>
+#include <inttypes.h>
+#include <stddef.h>
 #include <loaders/ksy/rage_of_mages_1_256.h>
 
 struct SOASpriteRGB;

diff --git a/include/graphics/soaspritergb.h b/include/graphics/soaspritergb.h
@@ -1,7 +1,8 @@
 #ifndef SOASPRITERGB_H
 #define SOASPRITERGB_H
 
-#include <cinttypes>
+#include <inttypes.h>
+#include <stddef.h>
 
 struct FrameBuffer;
 

diff --git a/include/graphics/soaspritergba.h b/include/graphics/soaspritergba.h
@@ -1,7 +1,8 @@
 #ifndef SOASPRITERGBA_H
 #define SOASPRITERGBA_H
 
-#include <cinttypes>
+#include <inttypes.h>
+#include <stddef.h>
 
 struct SOASpriteRGB;
 

diff --git a/include/graphics/tilemap/tilemap_chunk.h b/include/graphics/tilemap/tilemap_chunk.h
@@ -1,7 +1,8 @@
 #ifndef TILEMAP_CHUNK_H
 #define TILEMAP_CHUNK_H
 
-#include <cstdint>
+#include <inttypes.h>
+#include <stddef.h>
 
 struct TileCorners {
     uint8_t top_left_height;

diff --git a/src/graphics/soaspritergb.cpp b/src/graphics/soaspritergb.cpp
@@ -4,7 +4,7 @@
 
 SOASpritePal::SOASpritePal(size_t w, size_t h): width_{w}, height_{h} {
     buffer_raw_ = new uint8_t[w * h + 8 + 0x3000];
-    buffer_ = (reinterpret_cast<int32_t>(&buffer_raw_[0]) % 16 == 0)
+    buffer_ = (reinterpret_cast<int64_t>(&buffer_raw_[0]) % 16 == 0)
             ? &buffer_raw_[0]
             : &buffer_raw_[8];
     pal_r_ = buffer_ + w*h;
@@ -33,15 +33,15 @@ SOASpriteRGB::SOASpriteRGB(size_t w, size_t h): width_{w}, height_{h} {
     g_buffer_raw_ = new uint8_t[w * h + 8];
     b_buffer_raw_ = new uint8_t[w * h + 8];
 
-    r_buffer_ = (reinterpret_cast<int32_t>(&r_buffer_raw_[0]) % 16 == 0)
+    r_buffer_ = (reinterpret_cast<int64_t>(&r_buffer_raw_[0]) % 16 == 0)
         ? &r_buffer_raw_[0]
         : &r_buffer_raw_[8];
 
-    g_buffer_ = (reinterpret_cast<int32_t>(&g_buffer_raw_[0]) % 16 == 0)
+    g_buffer_ = (reinterpret_cast<int64_t>(&g_buffer_raw_[0]) % 16 == 0)
         ? &g_buffer_raw_[0]
         : &g_buffer_raw_[8];
 
-    b_buffer_ = (reinterpret_cast<int32_t>(&b_buffer_raw_[0]) % 16 == 0)
+    b_buffer_ = (reinterpret_cast<int64_t>(&b_buffer_raw_[0]) % 16 == 0)
         ? &b_buffer_raw_[0]
         : &b_buffer_raw_[8];
 }

diff --git a/src/graphics/soaspritergba.cpp b/src/graphics/soaspritergba.cpp
@@ -9,19 +9,19 @@ SOASpriteRGBA::SOASpriteRGBA(size_t w, size_t h): width_{w}, height_{h} {
     b_buffer_raw_ = new uint8_t[w * h + 8];
     a_buffer_raw_ = new uint8_t[w * h + 8];
 
-    r_buffer_ = (reinterpret_cast<int32_t>(&r_buffer_raw_[0]) % 16 == 0)
+    r_buffer_ = (reinterpret_cast<int64_t>(&r_buffer_raw_[0]) % 16 == 0)
         ? &r_buffer_raw_[0]
         : &r_buffer_raw_[8];
 
-    g_buffer_ = (reinterpret_cast<int32_t>(&g_buffer_raw_[0]) % 16 == 0)
+    g_buffer_ = (reinterpret_cast<int64_t>(&g_buffer_raw_[0]) % 16 == 0)
         ? &g_buffer_raw_[0]
         : &g_buffer_raw_[8];
 
-    b_buffer_ = (reinterpret_cast<int32_t>(&b_buffer_raw_[0]) % 16 == 0)
+    b_buffer_ = (reinterpret_cast<int64_t>(&b_buffer_raw_[0]) % 16 == 0)
         ? &b_buffer_raw_[0]
         : &b_buffer_raw_[8];
 
-    a_buffer_ = (reinterpret_cast<int32_t>(&a_buffer_raw_[0]) % 16 == 0)
+    a_buffer_ = (reinterpret_cast<int64_t>(&a_buffer_raw_[0]) % 16 == 0)
         ? &a_buffer_raw_[0]
         : &a_buffer_raw_[8];
 }