diff --git a/CMakeLists.txt b/CMakeLists.txt index 90399fc6..9ffaf20f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,6 @@ string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") # Compilation time options. option(CURL_SUPPORT "cURL support" ON) option(OPENAL_SUPPORT "OpenAL support" ON) -option(VULKAN_SUPPORT "Vulkan support" ON) option(SYSTEMWIDE_SUPPORT "Enable systemwide installation of game assets" OFF) # These variables will act as our list of include folders and linker flags. @@ -123,13 +122,6 @@ else() add_definitions(-DHAVE_EXECINFO) endif() -if (${VULKAN_SUPPORT}) - # We need an Vulkan implementation. - find_package(Vulkan REQUIRED) - list(APPEND yquake2IncludeDirectories ${Vulkan_INCLUDE_DIR}) - list(APPEND yquake2VulkanLinkerFlags ${Vulkan_LIBRARIES}) -endif() - # cURL support. if (${CURL_SUPPORT}) find_package(CURL REQUIRED) @@ -579,48 +571,6 @@ set(SOFT-Header ${COMMON_SRC_DIR}/header/shared.h ) -if (${VULKAN_SUPPORT}) - set(VK-Source - ${REF_SRC_DIR}/vk/vk_buffer.c - ${REF_SRC_DIR}/vk/vk_cmd.c - ${REF_SRC_DIR}/vk/vk_common.c - ${REF_SRC_DIR}/vk/vk_device.c - ${REF_SRC_DIR}/vk/vk_draw.c - ${REF_SRC_DIR}/vk/vk_image.c - ${REF_SRC_DIR}/vk/vk_light.c - ${REF_SRC_DIR}/vk/vk_mesh.c - ${REF_SRC_DIR}/vk/vk_model.c - ${REF_SRC_DIR}/vk/vk_pipeline.c - ${REF_SRC_DIR}/vk/vk_rmain.c - ${REF_SRC_DIR}/vk/vk_rmisc.c - ${REF_SRC_DIR}/vk/vk_rsurf.c - ${REF_SRC_DIR}/vk/vk_shaders.c - ${REF_SRC_DIR}/vk/vk_swapchain.c - ${REF_SRC_DIR}/vk/vk_validation.c - ${REF_SRC_DIR}/vk/vk_warp.c - ${REF_SRC_DIR}/vk/vk_util.c - ${REF_SRC_DIR}/vk/volk/volk.c - ${REF_SRC_DIR}/files/pcx.c - ${REF_SRC_DIR}/files/stb.c - ${REF_SRC_DIR}/files/wal.c - ${REF_SRC_DIR}/files/pvs.c - ${COMMON_SRC_DIR}/shared/shared.c - ${COMMON_SRC_DIR}/md4.c - ) - - set(VK-Header - ${REF_SRC_DIR}/ref_shared.h - ${REF_SRC_DIR}/files/stb_image.h - ${REF_SRC_DIR}/files/stb_image_resize.h - ${REF_SRC_DIR}/vk/header/qvk.h - ${REF_SRC_DIR}/vk/header/local.h - ${REF_SRC_DIR}/vk/header/model.h - ${REF_SRC_DIR}/vk/header/shaders.h - ${REF_SRC_DIR}/vk/header/util.h - ${COMMON_SRC_DIR}/header/shared.h - ) -endif() - # Wrapper for the Windows binary if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(Wrapper-Source @@ -707,15 +657,3 @@ set_target_properties(ref_soft PROPERTIES SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX} ) target_link_libraries(ref_soft ${yquake2LinkerFlags} ${yquake2SDLLinkerFlags}) - -if(${VULKAN_SUPPORT}) - # Build the vk renderer dynamic library - add_library(ref_vk MODULE ${VK-Source} ${VK-Header} ${REF-Platform-Specific-Source}) - set_target_properties(ref_vk PROPERTIES - PREFIX "" - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/release - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/release - SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX} - ) - target_link_libraries(ref_vk ${yquake2LinkerFlags} ${yquake2VulkanLinkerFlags} ${yquake2SDLLinkerFlags}) -endif()