加入volk 和 wma 后 编译不通过, 先保存代码
This commit is contained in:
+44
-6
@@ -2,15 +2,28 @@
|
||||
|
||||
project("sample")
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||
message(STATUS "Building for Android")
|
||||
|
||||
include_directories(
|
||||
vulkan
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/framework
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components/core
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components/core/include
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/vma
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/vma/include
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/volk
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/fmt
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/fmt/include
|
||||
)
|
||||
|
||||
add_library(sample SHARED
|
||||
@@ -20,6 +33,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||
vulkan/AppBase.cpp
|
||||
vulkan/Application.h
|
||||
vulkan/Application.cpp
|
||||
vulkan/FaceApp.h
|
||||
vulkan/FaceApp.cpp
|
||||
vulkan/lodepng.cpp
|
||||
)
|
||||
|
||||
find_package(game-activity REQUIRED CONFIG)
|
||||
@@ -41,11 +57,26 @@ endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR WIN32)
|
||||
message(STATUS "Building for Windows")
|
||||
add_compile_options(/utf-8)
|
||||
add_compile_definitions(_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/framework
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components/core
|
||||
${CMAKE_CURRENT_LIST_DIR}/vulkan/components/core/include
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/vma
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/vma/include
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/fmt
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/fmt/include
|
||||
${CMAKE_CURRENT_LIST_DIR}/third_party/volk
|
||||
"third_party/glfw-3.4/output/include"
|
||||
"C:/VulkanSDK/1.4.321.1/Include"
|
||||
)
|
||||
|
||||
|
||||
link_libraries(
|
||||
# "${CMAKE_CURRENT_LIST_DIR}/third_party/glfw-3.4/output/lib/glfw3.lib"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/third_party/glfw-3.4/output/glfw3.lib"
|
||||
@@ -54,10 +85,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR WIN32)
|
||||
|
||||
# 将源代码添加到此项目的可执行文件。
|
||||
add_executable (sample
|
||||
"vulkan/main.cpp"
|
||||
"vulkan/AppBase.h"
|
||||
"vulkan/AppBase.cpp"
|
||||
"vulkan/Application.h"
|
||||
"vulkan/Application.cpp"
|
||||
vulkan/AppBase.h
|
||||
vulkan/AppBase.cpp
|
||||
vulkan/Application.h
|
||||
vulkan/Application.cpp
|
||||
vulkan/FaceApp.h
|
||||
vulkan/FaceApp.cpp
|
||||
vulkan/main.cpp
|
||||
vulkan/lodepng.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
target_compile_definitions(sample PRIVATE VK_NO_PROTOTYPES)
|
||||
target_compile_definitions(sample PRIVATE GLM_ENABLE_EXPERIMENTAL)
|
||||
|
||||
Reference in New Issue
Block a user