diff --git a/libs/gfx/CMakeLists.txt b/libs/gfx/CMakeLists.txt index 887a3fd9..fe9e6105 100644 --- a/libs/gfx/CMakeLists.txt +++ b/libs/gfx/CMakeLists.txt @@ -1,7 +1,7 @@ find_file(KHR_PLATFORM_FILE KHR/khrplatform.h) file(GLOB_RECURSE PSEMEK_GFX_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp" "include/*.h") -file(GLOB_RECURSE PSEMEK_GFX_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp" "source/*.c") +file(GLOB_RECURSE PSEMEK_GFX_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp") psemek_add_library(psemek-gfx ${PSEMEK_GFX_HEADERS} ${PSEMEK_GFX_SOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/api/${PSEMEK_GL_API}/source/gl.cpp") target_include_directories(psemek-gfx PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/api/${PSEMEK_GL_API}/include") diff --git a/libs/gfx/source/detail/stb_image.c b/libs/gfx/source/detail/stb_image.cpp similarity index 76% rename from libs/gfx/source/detail/stb_image.c rename to libs/gfx/source/detail/stb_image.cpp index 28af4707..b6d8b812 100644 --- a/libs/gfx/source/detail/stb_image.c +++ b/libs/gfx/source/detail/stb_image.cpp @@ -1,6 +1,9 @@ #define STB_IMAGE_IMPLEMENTATION #define STBI_FAILURE_USERMSG +#include +#define STBI_ASSERT(x) assert(x) + #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-but-set-variable" #include