diff --git a/external/vcpkg b/external/vcpkg index c6ffd8e..6c937c3 160000 --- a/external/vcpkg +++ b/external/vcpkg @@ -1 +1 @@ -Subproject commit c6ffd8eeb2bd7309db2257f1f64aa4c87cefbe34 +Subproject commit 6c937c32233bdf295ab2140dbce97fd00084a5f3 diff --git a/libs/core/CMakeLists.txt b/libs/core/CMakeLists.txt index 17a106b..ea6db52 100644 --- a/libs/core/CMakeLists.txt +++ b/libs/core/CMakeLists.txt @@ -9,7 +9,7 @@ add_library(${MODULE_NAME} ${SRC_FILES}) if(USE_SDL_ENGINE) find_package(SDL2 CONFIG REQUIRED) - find_package(sdl2-net CONFIG REQUIRED) + find_package(SDL2_net CONFIG REQUIRED) endif() if(DEBUG_UI) find_package(imgui CONFIG REQUIRED) @@ -21,9 +21,11 @@ if(LINUX) endif() # Make a wrapper module for STB -find_path(STB_INCLUDE_DIRS "stb.h" REQUIRED) +find_package(Stb REQUIRED) +#target_include_directories(main PRIVATE ${Stb_INCLUDE_DIR}) +#find_path(STB_INCLUDE_DIRS "stb.h" REQUIRED) add_library(STB INTERFACE) -target_include_directories(STB INTERFACE ${STB_INCLUDE_DIRS}) +target_include_directories(STB INTERFACE ${Stb_INCLUDE_DIR}) target_include_directories(${MODULE_NAME} PUBLIC "include" @@ -37,7 +39,7 @@ target_link_libraries(${MODULE_NAME} noc $<$:linenoise> $<$:SDL2::SDL2> - $<$:SDL2::SDL2_net> + $<$:SDL2_net::SDL2_net-static> ) if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/libs/sdl_engine/CMakeLists.txt b/libs/sdl_engine/CMakeLists.txt index 945beba..d38581b 100644 --- a/libs/sdl_engine/CMakeLists.txt +++ b/libs/sdl_engine/CMakeLists.txt @@ -12,7 +12,7 @@ find_package(GLEW CONFIG REQUIRED) find_package(glm CONFIG REQUIRED) find_package(OpenGL MODULE REQUIRED) find_package(SDL2 CONFIG REQUIRED) -find_package(sdl2-net CONFIG REQUIRED) +find_package(SDL2_net CONFIG REQUIRED) find_package(imgui CONFIG REQUIRED) file(GLOB_RECURSE SRC_FILES "include/*.*" "src/*.*") @@ -32,7 +32,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE SDL2::SDL2 - SDL2::SDL2_net + SDL2_net::SDL2_net-static imgui::imgui GLEW::GLEW glm::glm