From 7b18f79ea61e3f2861ec56a93c2a6ce0ab7d4e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Fri, 24 May 2019 17:21:48 +0200 Subject: [PATCH] Rename legacy Vulkan triangle program Fixes #1477. (cherry picked from commit d834f01ca43c0f5ddd31b00a7fc2f48abbafa3da) --- .gitignore | 2 +- tests/CMakeLists.txt | 6 +++--- tests/{vulkan.c => triangle-vulkan.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename tests/{vulkan.c => triangle-vulkan.c} (100%) diff --git a/.gitignore b/.gitignore index 85949926..544117e0 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,6 @@ tests/tearing tests/threads tests/timeout tests/title -tests/vulkan +tests/triangle-vulkan tests/windows diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7e944668..fcc99243 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -39,7 +39,7 @@ add_executable(tearing WIN32 MACOSX_BUNDLE tearing.c ${GLAD_GL}) add_executable(threads WIN32 MACOSX_BUNDLE threads.c ${TINYCTHREAD} ${GLAD_GL}) add_executable(timeout WIN32 MACOSX_BUNDLE timeout.c ${GLAD_GL}) add_executable(title WIN32 MACOSX_BUNDLE title.c ${GLAD_GL}) -add_executable(vulkan WIN32 vulkan.c ${ICON} ${GLAD_VULKAN}) +add_executable(triangle-vulkan WIN32 triangle-vulkan.c ${ICON} ${GLAD_VULKAN}) add_executable(windows WIN32 MACOSX_BUNDLE windows.c ${GETOPT} ${GLAD_GL}) target_link_libraries(empty "${CMAKE_THREAD_LIBS_INIT}") @@ -50,7 +50,7 @@ if (RT_LIBRARY) endif() set(WINDOWS_BINARIES empty gamma icon inputlag joysticks opacity tearing - threads timeout title vulkan windows) + threads timeout title triangle-vulkan windows) set(CONSOLE_BINARIES clipboard events msaa glfwinfo iconify monitors reopen cursor) @@ -73,7 +73,7 @@ if (APPLE) set_target_properties(threads PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Threads") set_target_properties(timeout PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Timeout") set_target_properties(title PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Title") - set_target_properties(windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Vulkan") + set_target_properties(triangle-vulkan PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Vulkan Triangle") set_target_properties(windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Windows") set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES diff --git a/tests/vulkan.c b/tests/triangle-vulkan.c similarity index 100% rename from tests/vulkan.c rename to tests/triangle-vulkan.c