FIX: an attempt to properly link stb library with CMake

Author: ivan-mogilko

CMakeLists.txt

@@ -20,6 +20,7 @@ option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIB
 option(AGS_USE_LOCAL_SDL2_SOUND "Use a locally installed SDL2 Sound" ${AGS_USE_LOCAL_ALL_LIBRARIES})
 option(AGS_USE_LOCAL_GLM "Use a locally installed GLM" ${AGS_USE_LOCAL_ALL_LIBRARIES})
 option(AGS_USE_LOCAL_MINIZ "Use a locally installed Miniz" ${AGS_USE_LOCAL_ALL_LIBRARIES})
+option(AGS_USE_LOCAL_STB "Use a locally installed STB" ${AGS_USE_LOCAL_ALL_LIBRARIES})
 option(AGS_USE_LOCAL_TINYXML2 "Use a locally installed TinyXML2" ${AGS_USE_LOCAL_ALL_LIBRARIES})
 option(AGS_USE_LOCAL_OGG "Use a locally installed OGG" ${AGS_USE_LOCAL_ALL_LIBRARIES})
 option(AGS_USE_LOCAL_THEORA "Use a locally installed Theora" ${AGS_USE_LOCAL_ALL_LIBRARIES})
@@ -338,6 +339,11 @@ else()
     find_package(miniz REQUIRED)
     add_library(MiniZ::MiniZ ALIAS miniz::miniz)
 endif()
+if (NOT AGS_USE_LOCAL_STB)
+add_subdirectory(libsrc/stb                     EXCLUDE_FROM_ALL)
+else()
+    find_package(stb REQUIRED)
+endif()
 
 add_subdirectory(Common/libsrc/aastr-0.1.1      EXCLUDE_FROM_ALL)
 

Common/gfx/image_png.cpp

@@ -18,18 +18,14 @@
 // 
 //=============================================================================
 #include <allegro.h>
-
 // TODO: may create a separate header for including stb_image.h
 // with these predeclared flags
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_STATIC
 #define STBI_NO_STDIO
 #define STBI_NO_LINEAR
 #define STBI_NO_HDR
 #define STBI_ONLY_PNG
 #define STBI_NO_FAILURE_STRINGS
 #include <stb_image.h>
-
 #include <miniz.h>
 #include "gfx/bitmapdata.h"
 #include "util/stream.h"

Solutions/Common.Lib/Common.Lib.vcxproj

@@ -781,6 +781,7 @@
     <ClCompile Include="..\..\libsrc\allegro\src\vtable8.c" />
     <ClCompile Include="..\..\libsrc\allegro\src\win\gdi.c" />
     <ClCompile Include="..\..\libsrc\allegro\src\win\wfile.c" />
+    <ClCompile Include="..\..\libsrc\stb\stb.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Common\ac\audiocliptype.h" />

Solutions/Common.Lib/Common.Lib.vcxproj.filters

@@ -539,6 +539,9 @@
     <ClCompile Include="..\..\Common\gfx\image_png.cpp">
       <Filter>Source Files\gfx</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libsrc\stb\stb.c">
+      <Filter>Library Sources\stb</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Common\ac\audiocliptype.h">

Solutions/Tools.App/spritepak.vcxproj

@@ -41,6 +41,7 @@
     <ClCompile Include="..\..\Common\util\string_utils.cpp" />
     <ClCompile Include="..\..\libsrc\allegro\src\color.c" />
     <ClCompile Include="..\..\libsrc\miniz\miniz.c" />
+    <ClCompile Include="..\..\libsrc\stb\stb.c" />
     <ClCompile Include="..\..\Tools\spritepak\main.cpp" />
     <ClCompile Include="..\..\Tools\spritepak\commands.cpp" />
   </ItemGroup>

Solutions/Tools.App/spritepak.vcxproj.filters

@@ -94,6 +94,9 @@
     <ClCompile Include="..\..\Common\gfx\image_png.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libsrc\stb\stb.c">
+      <Filter>stb</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Tools\spritepak\commands.h">

Tools/spritepak/Makefile

@@ -51,11 +51,15 @@ MINIMAL_ALLEGRO_OBJS = \
 MINIZ_OBJS = \
 	../../libsrc/miniz/miniz.c
 
+STB_OBJS = \
+	../../libsrc/stb/stb_image.c
+
 OBJS := main.cpp \
 	commands.cpp \
 	$(COMMON_OBJS) \
 	$(MINIMAL_ALLEGRO_OBJS) \
 	$(MINIZ_OBJS)
+	$(STB_OBJS)
 OBJS := $(OBJS:.cpp=.o)
 OBJS := $(OBJS:.c=.o)
 

libsrc/stb/CMakeLists.txt

@@ -9,6 +9,7 @@ target_include_directories(stb PUBLIC . )
 
 target_sources(stb
         PRIVATE
+        stb_image.c
         stb_image.h
         )
 

libsrc/stb/stb_image.c

@@ -0,0 +1,8 @@
+
+#define STBI_NO_STDIO
+#define STBI_NO_LINEAR
+#define STBI_NO_HDR
+#define STBI_ONLY_PNG
+#define STBI_NO_FAILURE_STRINGS
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>