diff options
| author | Charles Giessen <charles@lunarg.com> | 2020-04-07 20:33:25 -0600 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2020-04-08 16:39:49 -0600 |
| commit | bb32b2a7016893617453ff9a3dba2a7a17c57b9b (patch) | |
| tree | a309280f522af40450e2bd8dc40f5ad0785838cf /vulkaninfo/macOS | |
| parent | 768a6917c099d39bf7959fe045e3b09ff55cfd2b (diff) | |
| download | usermoji-bb32b2a7016893617453ff9a3dba2a7a17c57b9b.tar.xz | |
vulkaninfo: dynamically link vulkan on apple
Due to difficulties setting up dynamic library loading on apple,
the change to use dynamic loading has been reverted to a dynamic link.
Change-Id: If980a327aa07669cc00aa4847dd4339a0ae42804
Diffstat (limited to 'vulkaninfo/macOS')
| -rw-r--r-- | vulkaninfo/macOS/vulkaninfo.cmake | 2 | ||||
| -rwxr-xr-x | vulkaninfo/macOS/vulkaninfo.sh | 4 | ||||
| -rwxr-xr-x | vulkaninfo/macOS/vulkaninfo_run.command | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/vulkaninfo/macOS/vulkaninfo.cmake b/vulkaninfo/macOS/vulkaninfo.cmake index 723473ba..7625384f 100644 --- a/vulkaninfo/macOS/vulkaninfo.cmake +++ b/vulkaninfo/macOS/vulkaninfo.cmake @@ -25,7 +25,6 @@ add_executable(vulkaninfo-bundle vulkaninfo.cpp ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.sh - ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo_run.command ${CMAKE_CURRENT_SOURCE_DIR}/macOS/Resources/VulkanIcon.icns ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo/metal_view.mm ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo/metal_view.h) @@ -39,7 +38,6 @@ target_link_libraries(vulkaninfo-bundle ${Vulkan_LIBRARY} "-framework AppKit -fr target_include_directories(vulkaninfo-bundle PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_BINARY_DIR}/vulkaninfo ${VulkanHeaders_INCLUDE_DIR}) add_dependencies(vulkaninfo-bundle MoltenVK_icd-staging-json) -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo_run.command PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS") set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.sh PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS") set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/Resources/VulkanIcon.icns PROPERTIES diff --git a/vulkaninfo/macOS/vulkaninfo.sh b/vulkaninfo/macOS/vulkaninfo.sh index d22df4be..0ee910e2 100755 --- a/vulkaninfo/macOS/vulkaninfo.sh +++ b/vulkaninfo/macOS/vulkaninfo.sh @@ -3,8 +3,8 @@ BASEDIR=`dirname $0` if [ -d /System/Applications/Utilities/Terminal.app ] then - open /System/Applications/Utilities/Terminal.app ./$BASEDIR/vulkaninfo_run.command + open /System/Applications/Utilities/Terminal.app $BASEDIR/vulkaninfo else - open /Applications/Utilities/Terminal.app ./$BASEDIR/vulkaninfo_run.command + open /Applications/Utilities/Terminal.app $BASEDIR/vulkaninfo fi diff --git a/vulkaninfo/macOS/vulkaninfo_run.command b/vulkaninfo/macOS/vulkaninfo_run.command deleted file mode 100755 index de730e82..00000000 --- a/vulkaninfo/macOS/vulkaninfo_run.command +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -BASEDIR=`dirname $0` -export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$BASEDIR -$BASEDIR/vulkaninfo |