diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7c5597bae2..1865eac69d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,7 +68,6 @@ jobs: -DTACTILE_BUILD_ZSTD_COMPRESSION=ON \ -DTACTILE_BUILD_OPENGL_RENDERER=ON \ -DTACTILE_BUILD_VULKAN_RENDERER=OFF \ - -DTACTILE_UNITY_BUILD=OFF \ -DTACTILE_USE_LTO=OFF \ -DTACTILE_USE_PRECOMPILED_HEADERS=ON \ --log-level=DEBUG diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 60d6d2011e..547919c2b4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -102,7 +102,6 @@ jobs: -DTACTILE_BUILD_ZSTD_COMPRESSION=ON \ -DTACTILE_BUILD_OPENGL_RENDERER=ON \ -DTACTILE_BUILD_VULKAN_RENDERER=OFF \ - -DTACTILE_UNITY_BUILD=OFF \ -DTACTILE_USE_LTO=OFF \ -DTACTILE_USE_PRECOMPILED_HEADERS=ON \ --log-level=DEBUG diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 395f093813..6d0f3bfd73 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -65,7 +65,6 @@ jobs: -DTACTILE_BUILD_ZSTD_COMPRESSION=ON ` -DTACTILE_BUILD_OPENGL_RENDERER=ON ` -DTACTILE_BUILD_VULKAN_RENDERER=OFF ` - -DTACTILE_UNITY_BUILD=OFF ` -DTACTILE_USE_LTO=OFF ` -DTACTILE_USE_PRECOMPILED_HEADERS=ON ` --log-level=DEBUG diff --git a/CMakeLists.txt b/CMakeLists.txt index 5949021b95..961124f859 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ option(TACTILE_BUILD_ZSTD_COMPRESSION "Build with Zstd compression support" ON) option(TACTILE_BUILD_OPENGL_RENDERER "Build the OpenGL renderer" OFF) option(TACTILE_BUILD_VULKAN_RENDERER "Build the Vulkan renderer" OFF) option(TACTILE_MACOS_APP_BUNDLE "Build the editor as a macOS application bundle (.app)" OFF) -option(TACTILE_UNITY_BUILD "Enable unity builds" OFF) option(TACTILE_USE_LTO "Enable link-time optimizations" OFF) option(TACTILE_USE_PRECOMPILED_HEADERS "Enable precompiled standard headers" ON) @@ -28,7 +27,6 @@ message(DEBUG "TACTILE_BUILD_ZSTD_COMPRESSION: ${TACTILE_BUILD_ZSTD_COMPRESSION} message(DEBUG "TACTILE_BUILD_OPENGL_RENDERER: ${TACTILE_BUILD_OPENGL_RENDERER}") message(DEBUG "TACTILE_BUILD_VULKAN_RENDERER: ${TACTILE_BUILD_VULKAN_RENDERER}") message(DEBUG "TACTILE_MACOS_APP_BUNDLE: ${TACTILE_MACOS_APP_BUNDLE}") -message(DEBUG "TACTILE_UNITY_BUILD: ${TACTILE_UNITY_BUILD}") message(DEBUG "TACTILE_USE_LTO: ${TACTILE_USE_LTO}") message(DEBUG "TACTILE_USE_PRECOMPILED_HEADERS: ${TACTILE_USE_PRECOMPILED_HEADERS}") diff --git a/cmake/tactile.cmake b/cmake/tactile.cmake index bf052f4e7d..2316b1ccb8 100644 --- a/cmake/tactile.cmake +++ b/cmake/tactile.cmake @@ -101,7 +101,6 @@ function(tactile_set_properties target) CXX_EXTENSIONS "OFF" CXX_STANDARD_REQUIRED "ON" POSITION_INDEPENDENT_CODE "ON" - UNITY_BUILD "${TACTILE_UNITY_BUILD}" INTERPROCEDURAL_OPTIMIZATION "${TACTILE_USE_LTO}" PREFIX "" )