* lib模式发布修正
This commit is contained in:
+1
-1
@@ -10,7 +10,6 @@ project ("dl")
|
||||
set(LIBTYPE STATIC)
|
||||
message("生成目标平台:${CMAKE_SYSTEM}")
|
||||
|
||||
|
||||
message("------------------dl option------------------")
|
||||
set(DL_VULKAN_DIR AUTO)
|
||||
#set(DL_VULKAN_DIR D:/VulkanSDK/1.3.268.0)
|
||||
@@ -118,6 +117,7 @@ add_subdirectory ("third/lz4")
|
||||
message("------------------zlib 压缩库---------")
|
||||
add_subdirectory ("third/zlib")
|
||||
message("------------------fmt 文本格式化库--------------")
|
||||
option(FMT_INSTALL "开启fmt的安装" ON)
|
||||
add_subdirectory ("third/fmt")
|
||||
|
||||
message("------------------lunasvg svg格式库-----------")
|
||||
|
||||
Vendored
+49
@@ -0,0 +1,49 @@
|
||||
|
||||
|
||||
#ifndef NDEBUG
|
||||
#pragma comment(lib, "dl.lib")
|
||||
#pragma comment(lib, "libiconvStatic.lib")
|
||||
#pragma comment(lib, "fmtd.lib")
|
||||
#pragma comment(lib, "freetyped.lib")
|
||||
#pragma comment(lib, "lunasvg.lib")
|
||||
#pragma comment(lib, "lz4.lib")
|
||||
#pragma comment(lib, "libwebp.lib")
|
||||
#pragma comment(lib, "OpenXLSXd.lib")
|
||||
#pragma comment(lib, "zlibstaticd.lib")
|
||||
#pragma comment(lib, "infowared.lib")
|
||||
#pragma comment(lib, "angelscriptd.lib")
|
||||
#else
|
||||
#pragma comment(lib, "dl.lib")
|
||||
#pragma comment(lib, "libiconvStatic.lib")
|
||||
#pragma comment(lib, "fmt.lib")
|
||||
#pragma comment(lib, "freetype.lib")
|
||||
#pragma comment(lib, "lunasvg.lib")
|
||||
#pragma comment(lib, "lz4.lib")
|
||||
#pragma comment(lib, "libwebp.lib")
|
||||
#pragma comment(lib, "OpenXLSX.lib")
|
||||
#pragma comment(lib, "zlibstatic.lib")
|
||||
#pragma comment(lib, "infoware.lib")
|
||||
#pragma comment(lib, "angelscript.lib")
|
||||
#endif
|
||||
|
||||
|
||||
#pragma comment(lib, "FLAC.lib")
|
||||
#pragma comment(lib, "glfw3.lib")
|
||||
#pragma comment(lib, "OpenAL32.lib")
|
||||
#pragma comment(lib, "FLAC.lib")
|
||||
#pragma comment(lib, "vorbis.lib")
|
||||
#pragma comment(lib, "vorbisfile.lib")
|
||||
#pragma comment(lib, "ogg.lib")
|
||||
#pragma comment(lib, "plutovg.lib")
|
||||
#pragma comment(lib, "lua.lib")
|
||||
#pragma comment(lib, "wcwidth.lib")
|
||||
|
||||
#pragma comment(lib, "libcurl.lib")
|
||||
#pragma comment(lib, "libcrypto_static.lib")
|
||||
#pragma comment(lib, "libssl_static.lib")
|
||||
#pragma comment(lib, "vulkan-1.lib")
|
||||
|
||||
#pragma comment(lib, "Wldap32.lib")
|
||||
#pragma comment(lib, "Crypt32.lib")
|
||||
#pragma comment(lib, "version.lib")
|
||||
#pragma comment(lib, "wbemuuid.lib")
|
||||
+6
-3
@@ -320,11 +320,14 @@ install(DIRECTORY "./"
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dl/
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/json/json.hpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/)
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/tinyxml2/tinyxml2.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/)
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/json/json.hpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/tinyxml2/tinyxml2.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/third/asio/include/
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp")
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/third/magic_enum/include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/third/lua/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
|
||||
# 复制
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ gcSprite Factory::CreateSpriteDefault(const Color& col /*= ColorDef::WHITE*/)
|
||||
spr->_order = Z_DEFAULT;
|
||||
|
||||
FactoryImp::SpriteInfo* spr_info = _imp->_get_sprite_info(spr->_id);
|
||||
assert(spr_info);
|
||||
assert(spr_info && "可能是忘了关闭发布模式");
|
||||
|
||||
for (int i = 0; i != 4; ++i)
|
||||
{
|
||||
|
||||
@@ -541,6 +541,7 @@ VkShaderModule VK::CreateShaderModule(Buffer& buf)
|
||||
VkShaderModule shaderModule;
|
||||
if (vkCreateShaderModule(_device, &createInfo, nullptr, &shaderModule) != VK_SUCCESS)
|
||||
{
|
||||
// 可能是没有拷贝 dl/res/dl 文件夹到资源目录,或是未设置工作路径
|
||||
log_damage0("创建shader模块失败!");
|
||||
return {};
|
||||
}
|
||||
|
||||
+15
-10
@@ -149,14 +149,19 @@ if (CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||
endif()
|
||||
|
||||
|
||||
install(DIRECTORY ${PATH_RES}/ DESTINATION bin/${PROJECT_NAME})
|
||||
if (USE_RENDER)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/res/dl DESTINATION bin/${PROJECT_NAME})
|
||||
endif()
|
||||
if (CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||
install(DIRECTORY ${DL_PATH_VLD}/ DESTINATION bin/${PROJECT_NAME})
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/vld/vld.ini DESTINATION bin/${PROJECT_NAME})
|
||||
endif()
|
||||
# 子项目暂不安装
|
||||
if (false)
|
||||
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME})
|
||||
install(DIRECTORY ${PATH_RES}/ DESTINATION bin/${PROJECT_NAME})
|
||||
if (USE_RENDER)
|
||||
install(DIRECTORY ${CMAKE_SOURCE_DIR}/res/dl DESTINATION bin/${PROJECT_NAME})
|
||||
endif()
|
||||
if (CMAKE_BUILD_TYPE MATCHES "Debug")
|
||||
install(DIRECTORY ${DL_PATH_VLD}/ DESTINATION bin/${PROJECT_NAME})
|
||||
install(FILES ${CMAKE_SOURCE_DIR}/third/vld/vld.ini DESTINATION bin/${PROJECT_NAME})
|
||||
endif()
|
||||
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME})
|
||||
|
||||
endif()
|
||||
Vendored
+1
-1
@@ -17,7 +17,7 @@ string(COMPARE EQUAL "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}" GLFW_ST
|
||||
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
|
||||
option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ${GLFW_STANDALONE})
|
||||
option(GLFW_BUILD_TESTS "Build the GLFW test programs" ${GLFW_STANDALONE})
|
||||
option(GLFW_BUILD_DOCS "Build the GLFW documentation" ON)
|
||||
option(GLFW_BUILD_DOCS "Build the GLFW documentation" OFF)
|
||||
option(GLFW_INSTALL "Generate installation target" ON)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
|
||||
Reference in New Issue
Block a user