Clean up libstb_image (#1494)

CMakeLists.txt

@@ -162,8 +162,10 @@ add_subdirectory(third-party/lzokay EXCLUDE_FROM_ALL)
 
 # build format library
 add_subdirectory(third-party/fmt EXCLUDE_FROM_ALL)
+add_subdirectory(third-party/stb_image EXCLUDE_FROM_ALL)
 add_subdirectory(third-party/tiny_gltf EXCLUDE_FROM_ALL)
 
+
 # discord rich presence
 include_directories(third-party/discord-rpc/include)
 add_subdirectory(third-party/discord-rpc EXCLUDE_FROM_ALL)

common/CMakeLists.txt

@@ -47,8 +47,7 @@ add_library(common
         util/os.cpp
         util/print_float.cpp
         util/FontUtils.cpp
-        util/FrameLimiter.cpp
-        util/image_loading.cpp)
+        util/FrameLimiter.cpp)
 
 target_link_libraries(common fmt lzokay replxx libzstd_static)
 

common/util/image_loading.cpp

@@ -1,13 +0,0 @@
-
-// hides warnings
-#ifdef __linux__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
-#define STB_IMAGE_IMPLEMENTATION
-#include "third-party/stb_image.h"
-
-#ifdef __linux__
-#pragma GCC diagnostic pop
-#endif

common/util/image_loading.h

@@ -1 +0,0 @@
-#include "third-party/stb_image.h"

decompiler/CMakeLists.txt

@@ -83,6 +83,7 @@ target_link_libraries(decomp
         lzokay
         common
         fmt
+        stb_image
         )
 
 add_executable(decompiler
@@ -92,7 +93,8 @@ target_link_libraries(decompiler
         decomp
         common
         lzokay
-        fmt)
+        fmt
+        stb_image)
 
 
 add_executable(extractor
@@ -103,4 +105,5 @@ target_link_libraries(extractor
         common
         lzokay
         fmt
-        compiler)
+        compiler
+        stb_image)

decompiler/data/TextureDB.cpp

@@ -2,7 +2,7 @@
 
 #include "third-party/fmt/core.h"
 #include "common/util/Assert.h"
-#include "third-party/stb_image.h"
+#include "third-party/stb_image/stb_image.h"
 #include <filesystem>
 
 namespace decompiler {

game/CMakeLists.txt

@@ -157,7 +157,7 @@ add_subdirectory(sound)
 # we build the runtime as a static library.
 add_library(runtime STATIC ${RUNTIME_SOURCE} "../third-party/glad/src/glad.c")
 
-target_link_libraries(runtime common fmt glfw imgui discord-rpc sound)
+target_link_libraries(runtime common fmt glfw imgui discord-rpc sound stb_image)
 if(WIN32)
     target_link_libraries(runtime mman)
 else()

game/graphics/pipelines/opengl.cpp

@@ -21,7 +21,7 @@
 #include "game/system/newpad.h"
 #include "common/log/log.h"
 #include "common/goal_constants.h"
-#include "common/util/image_loading.h"
+#include "third-party/stb_image/stb_image.h"
 #include "game/runtime.h"
 #include "common/util/Timer.h"
 #include "game/graphics/opengl_renderer/debug_gui.h"

third-party/stb_image/CMakeLists.txt

@@ -0,0 +1,9 @@
+if (UNIX)
+    set(CMAKE_CXX_FLAGS "-O3")
+else ()
+    set(CMAKE_CXX_FLAGS "/EHsc")
+endif (UNIX)
+
+
+add_library(stb_image stb_image.cpp)
+

third-party/stb_image/stb_image.cpp

@@ -0,0 +1,4 @@
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.h"
+#include "stb_image.h"

third-party/tiny_gltf/CMakeLists.txt

@@ -4,6 +4,7 @@ else ()
     set(CMAKE_CXX_FLAGS "/EHsc")
 endif (UNIX)
 
-include_directories(../)
+include_directories(../ ../stb_image)
 add_library(tiny_gltf tiny_gltf.cpp)
+target_link_libraries(tiny_gltf stb_image)
 

third-party/tiny_gltf/tiny_gltf.cpp

@@ -1,4 +1,4 @@
 #define TINYGLTF_IMPLEMENTATION
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "tiny_gltf.h"
+
+#include "third-party/tiny_gltf/tiny_gltf.h"
+