Android 编译通过
This commit is contained in:
+11
-20
@@ -15,19 +15,12 @@ endif()
|
||||
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
|
||||
third_party/glm
|
||||
third_party/vma
|
||||
third_party/vma/include
|
||||
)
|
||||
|
||||
add_library(sample SHARED
|
||||
@@ -40,6 +33,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||
vulkan/FaceApp.h
|
||||
vulkan/FaceApp.cpp
|
||||
vulkan/lodepng.cpp
|
||||
third_party/vma/src/VmaUsage.h
|
||||
third_party/vma/src/VmaUsage.cpp
|
||||
)
|
||||
|
||||
find_package(game-activity REQUIRED CONFIG)
|
||||
@@ -56,6 +51,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||
android
|
||||
log)
|
||||
|
||||
target_compile_definitions(sample PRIVATE
|
||||
VMA_STATIC_VULKAN_FUNCTIONS=0
|
||||
VMA_DYNAMIC_VULKAN_FUNCTIONS=1
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
|
||||
@@ -66,17 +66,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR WIN32)
|
||||
|
||||
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/glm
|
||||
${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"
|
||||
)
|
||||
@@ -100,8 +93,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR WIN32)
|
||||
vulkan/lodepng.cpp
|
||||
third_party/vma/src/VmaUsage.h
|
||||
third_party/vma/src/VmaUsage.cpp
|
||||
third_party/fmt/src/format.cc
|
||||
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user