Add dynamic linking support

andrejnau · Jan 13, 2024 · daeeb3f · daeeb3f
1 parent 08173f8
commit daeeb3f
Show file tree

Hide file tree

Showing 36 changed files with 323 additions and 1,594 deletions.
diff --git a/cmake/3rdparty/vulkan.cmake b/cmake/3rdparty/vulkan.cmake
@@ -51,8 +51,6 @@ elseif(APPLE)
         INTERFACE_COMPILE_DEFINITIONS
             VK_USE_PLATFORM_METAL_EXT
     )
-    set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
-    set(CMAKE_INSTALL_RPATH "/usr/local/lib")
 elseif(NOT ANDROID)
     set_property(TARGET vulkan APPEND PROPERTY
         INTERFACE_COMPILE_DEFINITIONS

diff --git a/cmake/cmake_settings.cmake b/cmake/cmake_settings.cmake
@@ -4,8 +4,17 @@ endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
+
+if (APPLE)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+    if (VULKAN_SUPPORT)
+        set(CMAKE_INSTALL_RPATH "@executable_path;/usr/local/lib")
+    else()
+        set(CMAKE_INSTALL_RPATH "@executable_path")
+    endif()
+endif()
diff --git a/src/Apps/CoreDxrTriangle/CMakeLists.txt b/src/Apps/CoreDxrTriangle/CMakeLists.txt
@@ -24,7 +24,7 @@ target_include_directories(${target}
 target_link_libraries(${target}
     AppBox
     Utilities
-    Instance
+    FlyCube
     FlyCubeAssets
 )
 

diff --git a/src/Apps/CoreTriangle/CMakeLists.txt b/src/Apps/CoreTriangle/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 
 target_link_libraries(CoreTriangle
     AppBox
-    Instance
+    FlyCube
     FlyCubeAssets
 )
 

diff --git a/src/Apps/CoreTriangleUIKit/CMakeLists.txt b/src/Apps/CoreTriangleUIKit/CMakeLists.txt
@@ -18,7 +18,7 @@ add_executable(CoreTriangleUIKit MACOSX_BUNDLE
 
 target_link_libraries(CoreTriangleUIKit
    AppBoxApple
-   Instance
+   FlyCube
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "iOS")

diff --git a/src/FlyCube/Adapter/CMakeLists.txt b/src/FlyCube/Adapter/CMakeLists.txt
diff --git a/src/FlyCube/ApiType/ApiType.h b/src/FlyCube/ApiType/ApiType.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <stdint.h>
+#include <cstdint>
 
 enum class ApiType {
     kVulkan,

diff --git a/src/FlyCube/ApiType/CMakeLists.txt b/src/FlyCube/ApiType/CMakeLists.txt
diff --git a/src/FlyCube/BindingSet/CMakeLists.txt b/src/FlyCube/BindingSet/CMakeLists.txt
diff --git a/src/FlyCube/BindingSetLayout/CMakeLists.txt b/src/FlyCube/BindingSetLayout/CMakeLists.txt