Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ci

This commit is contained in:
halx99 2022-11-15 12:21:50 +08:00
parent a3405298db
commit 1670b5a393
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/Effekseer/EffekseerForCocos2d-x/CMakeLists.txt
View File

@ -43,13 +43,12 @@ else()
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PUBLIC ../EffekseerRendererGL/) PUBLIC ../EffekseerRendererGL/)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} EffekseerRendererGL)
PUBLIC EffekseerRendererGL)
add_dependencies(${PROJECT_NAME} EffekseerRendererGL) add_dependencies(${PROJECT_NAME} EffekseerRendererGL)
endif() endif()
target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer) target_link_libraries(${PROJECT_NAME} Effekseer)
add_dependencies(${PROJECT_NAME} Effekseer) add_dependencies(${PROJECT_NAME} Effekseer)
@ -58,7 +57,7 @@ if(ANDROID)
target_link_libraries(${PROJECT_NAME} INTERFACE ${_AX_CORE_LIB}) target_link_libraries(${PROJECT_NAME} INTERFACE ${_AX_CORE_LIB})
target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:${_AX_CORE_LIB},INTERFACE_INCLUDE_DIRECTORIES>) target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:${_AX_CORE_LIB},INTERFACE_INCLUDE_DIRECTORIES>)
else() else()
target_link_libraries(${PROJECT_NAME} PUBLIC ${_AX_CORE_LIB}) target_link_libraries(${PROJECT_NAME} ${_AX_CORE_LIB})
endif() endif()
set(_AX_EXTENSION_LIBS "${PROJECT_NAME};${_AX_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application") set(_AX_EXTENSION_LIBS "${PROJECT_NAME};${_AX_EXTENSION_LIBS}" CACHE INTERNAL "extensions for auto link to target application")

2
extensions/Effekseer/EffekseerRendererCommon/CMakeLists.txt
View File

@ -30,7 +30,7 @@ if(BUILD_UNITYPLUGIN_FOR_IOS)
file(GLOB_RECURSE LOCAL_SOURCES *.cpp) file(GLOB_RECURSE LOCAL_SOURCES *.cpp)
add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES})
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES}) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES})
target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer) target_link_libraries(${PROJECT_NAME} Effekseer)
endif() endif()
set_target_properties( set_target_properties(

2
extensions/Effekseer/EffekseerRendererGL/CMakeLists.txt
View File

@ -38,7 +38,7 @@ set(PublicHeader
add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES})
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES}) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/../Effekseer ${EFK_THIRDPARTY_INCLUDES})
set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeader}") set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${PublicHeader}")
target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer) target_link_libraries(${PROJECT_NAME} Effekseer)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PUBLIC "${_AX_ROOT_PATH}/thirdparty/glad/include" PUBLIC "${_AX_ROOT_PATH}/thirdparty/glad/include"
PUBLIC "${_AX_ROOT_PATH}/core" PUBLIC "${_AX_ROOT_PATH}/core"

2
extensions/Effekseer/EffekseerRendererMetal/CMakeLists.txt
View File

@ -47,7 +47,7 @@ set(LOCAL_SOURCES
add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES}) add_library(${PROJECT_NAME} STATIC ${LOCAL_SOURCES})
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES}) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../Effekseer ${CMAKE_CURRENT_LIST_DIR}/../3rdparty/LLGI/src ${EFK_THIRDPARTY_INCLUDES})
set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${LOCAL_HEADERS_Metal}") set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${LOCAL_HEADERS_Metal}")
target_link_libraries(${PROJECT_NAME} PUBLIC Effekseer LLGI) target_link_libraries(${PROJECT_NAME} Effekseer LLGI)
if(USE_LIBPNG_LOADER) if(USE_LIBPNG_LOADER)
add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng) add_dependencies(${PROJECT_NAME} ExternalProject_zlib ExternalProject_libpng)

2
extensions/Live2D/CMakeLists.txt
View File

@ -39,7 +39,7 @@ add_subdirectory(Core)
if (ANDROID) if (ANDROID)
target_link_libraries(${LIB_NAME} INTERFACE Live2DCubismCore) target_link_libraries(${LIB_NAME} INTERFACE Live2DCubismCore)
else() else()
target_link_libraries(${LIB_NAME} PUBLIC Live2DCubismCore) target_link_libraries(${LIB_NAME} Live2DCubismCore)
endif() endif()
setup_ax_extension_config(${LIB_NAME}) setup_ax_extension_config(${LIB_NAME})