diff --git a/CMakeLists.txt b/CMakeLists.txt index 968c82d..acfc458 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ add_subdirectory(third_party/msdfgen) add_subdirectory(src/sokol) add_subdirectory(src/mirage_render) add_subdirectory(src/mirage_image) -add_subdirectory(src/mirage_stb_image) +add_subdirectory(src/mirage_stb_image_loader) add_subdirectory(src/mirage_core) add_subdirectory(src/mirage_widget) add_subdirectory(src/mirage_app) diff --git a/src/mirage_core/CMakeLists.txt b/src/mirage_core/CMakeLists.txt index 9097115..df86a69 100644 --- a/src/mirage_core/CMakeLists.txt +++ b/src/mirage_core/CMakeLists.txt @@ -9,7 +9,7 @@ set(SRC_FILES) retrieve_files(${CMAKE_CURRENT_SOURCE_DIR} SRC_FILES) add_library(${PROJECT_NAME} STATIC ${SRC_FILES}) -target_link_libraries(${PROJECT_NAME} PUBLIC Freetype::Freetype Eigen3::Eigen) +target_link_libraries(${PROJECT_NAME} PUBLIC Freetype::Freetype Eigen3::Eigen mirage_image) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_os_definitions(${PROJECT_NAME}) target_compile_definitions(${PROJECT_NAME} PUBLIC -DNOMINMAX) diff --git a/src/mirage_stb_image/CMakeLists.txt b/src/mirage_stb_image_loader/CMakeLists.txt similarity index 100% rename from src/mirage_stb_image/CMakeLists.txt rename to src/mirage_stb_image_loader/CMakeLists.txt diff --git a/src/mirage_stb_image/stb_image.h b/src/mirage_stb_image_loader/stb_image.h similarity index 100% rename from src/mirage_stb_image/stb_image.h rename to src/mirage_stb_image_loader/stb_image.h diff --git a/src/mirage_stb_image/stb_image_loader.cpp b/src/mirage_stb_image_loader/stb_image_loader.cpp similarity index 100% rename from src/mirage_stb_image/stb_image_loader.cpp rename to src/mirage_stb_image_loader/stb_image_loader.cpp diff --git a/src/mirage_stb_image/stb_image_loader.h b/src/mirage_stb_image_loader/stb_image_loader.h similarity index 100% rename from src/mirage_stb_image/stb_image_loader.h rename to src/mirage_stb_image_loader/stb_image_loader.h