diff --git a/cmake/absl.cmake b/cmake/absl.cmake index 42fed470..fed9eb81 100644 --- a/cmake/absl.cmake +++ b/cmake/absl.cmake @@ -1,4 +1,8 @@ +if (MINGW) + add_subdirectory(src/lib/abseil-cpp) +else() find_package(absl) +endif() set(ABSL_PROPAGATE_CXX_STD ON) set(ABSL_CXX_STANDARD 17) set(ABSL_USE_GOOGLETEST_HEAD ON) diff --git a/cmake/imgui.cmake b/cmake/imgui.cmake index a2fc8b0b..1b552f32 100644 --- a/cmake/imgui.cmake +++ b/cmake/imgui.cmake @@ -10,17 +10,17 @@ target_compile_definitions(ImGui PUBLIC set(IMGUI_FILE_DLG_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiFileDialog) file(GLOB IMGUI_FILE_DLG_SOURCES ${IMGUI_FILE_DLG_PATH}/*.cpp) add_library("ImGuiFileDialog" STATIC ${IMGUI_FILE_DLG_SOURCES}) -target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH}) +target_include_directories(ImGuiFileDialog PUBLIC ${IMGUI_PATH} ${CMAKE_SOURCE_DIR}/src/lib) set(IMGUI_COLOR_TEXT_EDIT_PATH ${CMAKE_SOURCE_DIR}/src/lib/ImGuiColorTextEdit) file(GLOB IMGUI_COLOR_TEXT_EDIT_SOURCES ${IMGUI_COLOR_TEXT_EDIT_PATH}/*.cpp) add_library("ImGuiColorTextEdit" STATIC ${IMGUI_COLOR_TEXT_EDIT_SOURCES}) -target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH}) +target_include_directories(ImGuiColorTextEdit PUBLIC ${IMGUI_PATH} ${CMAKE_SOURCE_DIR}/src/lib) set(IMGUI_TEST_ENGINE_PATH ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine/imgui_test_engine) file(GLOB IMGUI_TEST_ENGINE_SOURCES ${IMGUI_TEST_ENGINE_PATH}/*.cpp) add_library("ImGuiTestEngine" STATIC ${IMGUI_TEST_ENGINE_SOURCES}) -target_include_directories(ImGuiTestEngine PUBLIC ${IMGUI_PATH}) +target_include_directories(ImGuiTestEngine PUBLIC ${IMGUI_PATH} ${CMAKE_SOURCE_DIR}/src/lib) target_link_libraries(ImGuiTestEngine PUBLIC ImGui) set( @@ -36,6 +36,6 @@ set( ${IMGUI_COLOR_TEXT_EDIT_PATH}/TextEditor.cpp ) -if (LINUX) +if (LINUX OR MINGW) add_definitions("-DIMGUI_ENABLE_TEST_ENGINE -DIMGUI_TEST_ENGINE_ENABLE_COROUTINE_STDTHREAD_IMPL=1") endif() \ No newline at end of file diff --git a/cmake/sdl2.cmake b/cmake/sdl2.cmake index b33351c7..7c90c839 100644 --- a/cmake/sdl2.cmake +++ b/cmake/sdl2.cmake @@ -1,5 +1,5 @@ # SDL2 -if (UNIX) +if (UNIX OR MINGW) add_subdirectory(src/lib/SDL) else() find_package(SDL2) @@ -13,4 +13,14 @@ if(WIN32 OR MINGW) endif() # libpng -find_package(PNG REQUIRED) \ No newline at end of file +if (MINGW) + set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/build-windows/src/lib/zlib) + set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/build-windows/src/lib/zlib) + set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/lib/zlib) + set(YAZE_BUILD_PYTHON OFF) + set(YAZE_BUILD_EXTENSIONS OFF) + add_subdirectory(src/lib/zlib) + add_subdirectory(src/lib/libpng) +else() + find_package(PNG REQUIRED) +endif() \ No newline at end of file