diff --git a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt index 03d1c6aa4c..f985d58b6f 100644 --- a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt +++ b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt @@ -17,6 +17,8 @@ // Operators +, *, / based on http://half.sourceforge.net/ by Christian Rau // and licensed under MIT +@file:Suppress("NOTHING_TO_INLINE") + package com.google.android.filament.utils import com.google.android.filament.utils.Half.Companion.POSITIVE_INFINITY diff --git a/build.sh b/build.sh index f5f4edcb54..55143b74ef 100755 --- a/build.sh +++ b/build.sh @@ -752,7 +752,10 @@ function run_tests { } function check_debug_release_build { - if [[ "${ISSUE_DEBUG_BUILD}" == "true" || "${ISSUE_RELEASE_BUILD}" == "true" ]]; then + if [[ "${ISSUE_DEBUG_BUILD}" == "true" || \ + "${ISSUE_RELEASE_BUILD}" == "true" || \ + "${ISSUE_CLEAN}" == "true" || \ + "${ISSUE_WEB_DOCS}" == "true" ]]; then "$@"; else echo "You must declare a debug or release target for $@ builds." diff --git a/filament/benchmark/CMakeLists.txt b/filament/benchmark/CMakeLists.txt index a14f15b76d..9c236121d6 100644 --- a/filament/benchmark/CMakeLists.txt +++ b/filament/benchmark/CMakeLists.txt @@ -10,6 +10,6 @@ set(BENCHMARK_SRCS add_executable(benchmark_filament ${BENCHMARK_SRCS}) -target_link_libraries(benchmark_filament PRIVATE benchmark_main utils math filament) +target_link_libraries(benchmark_filament PRIVATE benchmark_main filament) set_target_properties(benchmark_filament PROPERTIES FOLDER Benchmarks) diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt index 8816a8d695..351d395486 100644 --- a/libs/image/CMakeLists.txt +++ b/libs/image/CMakeLists.txt @@ -55,6 +55,6 @@ install(DIRECTORY ${PUBLIC_HDR_DIR}/image DESTINATION include) # ================================================================================================== if (NOT ANDROID AND NOT WEBGL AND NOT IOS AND NOT FILAMENT_SKIP_SDL2) add_executable(test_${TARGET} tests/test_image.cpp) - target_link_libraries(test_${TARGET} PRIVATE image imageio gtest) + target_link_libraries(test_${TARGET} PRIVATE imageio gtest) set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests) endif() diff --git a/tools/cmgen/CMakeLists.txt b/tools/cmgen/CMakeLists.txt index 874cb9003f..4913b56dd7 100644 --- a/tools/cmgen/CMakeLists.txt +++ b/tools/cmgen/CMakeLists.txt @@ -20,7 +20,7 @@ set(SRCS # ================================================================================================== add_executable(${TARGET} ${HDRS} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE math utils ibl z image imageio getopt) +target_link_libraries(${TARGET} PRIVATE ibl imageio getopt) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) # ================================================================================================== @@ -54,6 +54,6 @@ install(TARGETS ${TARGET} RUNTIME DESTINATION bin) # ================================================================================================== if (NOT ANDROID) add_executable(test_${TARGET} tests/test_cmgen.cpp) - target_link_libraries(test_${TARGET} PRIVATE image imageio gtest) + target_link_libraries(test_${TARGET} PRIVATE imageio gtest) set_target_properties(test_${TARGET} PROPERTIES FOLDER Tests) endif() diff --git a/tools/cso-lut/CMakeLists.txt b/tools/cso-lut/CMakeLists.txt index 0d3eab12bf..f117a58a5f 100644 --- a/tools/cso-lut/CMakeLists.txt +++ b/tools/cso-lut/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRCS src/main.cpp) # ================================================================================================== add_executable(${TARGET} ${HDRS} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt) +target_link_libraries(${TARGET} PRIVATE imageio getopt) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) # ================================================================================================== diff --git a/tools/filamesh/CMakeLists.txt b/tools/filamesh/CMakeLists.txt index fa97069aef..680262dcc9 100644 --- a/tools/filamesh/CMakeLists.txt +++ b/tools/filamesh/CMakeLists.txt @@ -16,10 +16,7 @@ set(SRCS # ================================================================================================== add_executable(${TARGET} ${SRCS}) -target_link_libraries(${TARGET} PUBLIC math) -target_link_libraries(${TARGET} PUBLIC utils) -target_link_libraries(${TARGET} PUBLIC assimp) -target_link_libraries(${TARGET} PRIVATE getopt filameshio meshoptimizer) +target_link_libraries(${TARGET} PRIVATE assimp getopt filameshio meshoptimizer) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) # ================================================================================================== diff --git a/tools/matinfo/CMakeLists.txt b/tools/matinfo/CMakeLists.txt index bddcaaa60d..917d464fb9 100644 --- a/tools/matinfo/CMakeLists.txt +++ b/tools/matinfo/CMakeLists.txt @@ -13,7 +13,7 @@ set(SRCS src/main.cpp) # ================================================================================================== add_executable(${TARGET} ${SRCS}) -target_link_libraries(${TARGET} matdbg filaflat backend_headers utils getopt SPIRV-Tools spirv-cross-glsl) +target_link_libraries(${TARGET} matdbg filaflat backend_headers getopt) # glslang contains a copy of the SPIRV headers, so let's just use those. The leading ".." in the # following variable refers to the project name that we define in glslang/tnt, and the trailing ".." diff --git a/tools/mipgen/CMakeLists.txt b/tools/mipgen/CMakeLists.txt index b26c8b6714..ea58e32a43 100644 --- a/tools/mipgen/CMakeLists.txt +++ b/tools/mipgen/CMakeLists.txt @@ -12,7 +12,7 @@ set(SRCS src/main.cpp) # Target definitions # ================================================================================================== add_executable(${TARGET} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt) +target_link_libraries(${TARGET} PRIVATE imageio getopt) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) # ================================================================================================= diff --git a/tools/normal-blending/CMakeLists.txt b/tools/normal-blending/CMakeLists.txt index 8600334886..8fbf794315 100644 --- a/tools/normal-blending/CMakeLists.txt +++ b/tools/normal-blending/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRCS src/main.cpp) # ================================================================================================== add_executable(${TARGET} ${HDRS} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt) +target_link_libraries(${TARGET} PRIVATE imageio getopt) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) diff --git a/tools/roughness-prefilter/CMakeLists.txt b/tools/roughness-prefilter/CMakeLists.txt index c8387e533c..9addaa1e91 100644 --- a/tools/roughness-prefilter/CMakeLists.txt +++ b/tools/roughness-prefilter/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRCS src/main.cpp) # ================================================================================================== add_executable(${TARGET} ${HDRS} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE math utils z image imageio getopt) +target_link_libraries(${TARGET} PRIVATE imageio getopt) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) diff --git a/tools/uberz/CMakeLists.txt b/tools/uberz/CMakeLists.txt index d9352e5a65..8f43412000 100644 --- a/tools/uberz/CMakeLists.txt +++ b/tools/uberz/CMakeLists.txt @@ -13,7 +13,7 @@ set(SRCS # Target definitions # ================================================================================================== add_executable(${TARGET} ${SRCS}) -target_link_libraries(${TARGET} PRIVATE utils getopt uberzlib) +target_link_libraries(${TARGET} PRIVATE getopt uberzlib) set_target_properties(${TARGET} PROPERTIES FOLDER Tools) # =================================================================================================