NDT/EtrediaEmpires
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix P7 compile target

Browse Source
This commit is contained in:
legatt 2026-01-18 21:05:59 +03:00
parent 0ff3a35ed3
commit 90b28158be
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
p7lib/Sources/CMakeLists.txt
View File

@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(p7) project(p7)
include_directories(${PATH_SHARED})
include_directories(${PATH_SHARED_PLATFORM})
include_directories(${PATH_P7_API})
if(WIN32) if(WIN32)
set(P7_PLATFORM_LIBS Ws2_32) set(P7_PLATFORM_LIBS Ws2_32)
elseif(UNIX) elseif(UNIX)
@ -18,6 +14,22 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} P7_SOURCES)
add_library(${PROJECT_NAME} STATIC ${P7_SOURCES}) add_library(${PROJECT_NAME} STATIC ${P7_SOURCES})
target_link_libraries(${PROJECT_NAME} PUBLIC ${P7_PLATFORM_LIBS}) 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) if(P7_BUILD_SHARED)
add_library(${PROJECT_NAME}-shared SHARED ${P7_SOURCES}) 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/") target_include_directories(${PROJECT_NAME}-shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Headers/")
endif() 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) if(WIN32)
target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Shared/Platforms/Windows_x86/") target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../Shared/Platforms/Windows_x86/")
elseif(UNIX) elseif(UNIX)

2
renderers/magnum-renderer/CMakeLists.txt
View File

@ -43,7 +43,7 @@ add_library(${PROJECT_NAME} ${SOURCES})
target_link_libraries(${PROJECT_NAME} PUBLIC engine-api) target_link_libraries(${PROJECT_NAME} PUBLIC engine-api)
target_link_libraries(${PROJECT_NAME} PUBLIC utils) 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 target_link_libraries(${PROJECT_NAME} PRIVATE
Magnum::GL Magnum::GL
Magnum::GlfwApplication Magnum::GlfwApplication

2
renderers/magnum-renderer/src/Renderer.cpp
View File

@ -9,8 +9,6 @@
#include <Corrade/Utility/Debug.h> #include <Corrade/Utility/Debug.h>
#include <string>
using namespace Math::Literals; using namespace Math::Literals;
MagnumRenderer::MagnumRenderer(GLFWwindow *window) : IRenderer(window) MagnumRenderer::MagnumRenderer(GLFWwindow *window) : IRenderer(window)