From 90b28158be1728476f15f681bb8ab4f1a0a546fb Mon Sep 17 00:00:00 2001 From: legatt Date: Sun, 18 Jan 2026 21:05:59 +0300 Subject: [PATCH] Fix P7 compile target --- p7lib/Sources/CMakeLists.txt | 23 +++++++++++++++------- renderers/magnum-renderer/CMakeLists.txt | 2 +- renderers/magnum-renderer/src/Renderer.cpp | 2 -- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/p7lib/Sources/CMakeLists.txt b/p7lib/Sources/CMakeLists.txt index e25603d..23d6656 100644 --- a/p7lib/Sources/CMakeLists.txt +++ b/p7lib/Sources/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(p7) -include_directories(${PATH_SHARED}) -include_directories(${PATH_SHARED_PLATFORM}) -include_directories(${PATH_P7_API}) - if(WIN32) set(P7_PLATFORM_LIBS Ws2_32) elseif(UNIX) @@ -18,6 +14,22 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} P7_SOURCES) add_library(${PROJECT_NAME} STATIC ${P7_SOURCES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${P7_PLATFORM_LIBS}) +target_include_directories(p7 + PUBLIC + ${PATH_P7_API} + ${CMAKE_CURRENT_SOURCE_DIR}/../Headers + ${CMAKE_CURRENT_SOURCE_DIR}/../Shared +) + +if(WIN32) + target_include_directories(p7 PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../Shared/Platforms/Windows_x86 + ) +elseif(UNIX) + target_include_directories(p7 PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../Shared/Platforms/Linux_x86 + ) +endif() if(P7_BUILD_SHARED) add_library(${PROJECT_NAME}-shared SHARED ${P7_SOURCES}) @@ -36,9 +48,6 @@ if(P7_BUILD_SHARED) target_include_directories(${PROJECT_NAME}-shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Headers/") endif() -target_include_directories(${PROJECT_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/../Headers/") -target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Shared/") - if(WIN32) target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Shared/Platforms/Windows_x86/") elseif(UNIX) diff --git a/renderers/magnum-renderer/CMakeLists.txt b/renderers/magnum-renderer/CMakeLists.txt index ec1c7ed..55e3757 100644 --- a/renderers/magnum-renderer/CMakeLists.txt +++ b/renderers/magnum-renderer/CMakeLists.txt @@ -43,7 +43,7 @@ add_library(${PROJECT_NAME} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PUBLIC engine-api) target_link_libraries(${PROJECT_NAME} PUBLIC utils) -target_link_libraries(${PROJECT_NAME} PRIVATE p7) +target_link_libraries(${PROJECT_NAME} PUBLIC p7) target_link_libraries(${PROJECT_NAME} PRIVATE Magnum::GL Magnum::GlfwApplication diff --git a/renderers/magnum-renderer/src/Renderer.cpp b/renderers/magnum-renderer/src/Renderer.cpp index ff6bc8d..24e0f81 100644 --- a/renderers/magnum-renderer/src/Renderer.cpp +++ b/renderers/magnum-renderer/src/Renderer.cpp @@ -9,8 +9,6 @@ #include -#include - using namespace Math::Literals; MagnumRenderer::MagnumRenderer(GLFWwindow *window) : IRenderer(window)