Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code review fixups for libibl_lite.

Browse Source
This commit is contained in:
Philip Rideout
2020-12-09 10:03:42 -08:00
parent 6919e3b274
commit 8f8d51e17b
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/filament-android/CMakeLists.txt
View File

@@ -17,9 +17,9 @@ add_library(utils STATIC IMPORTED)
set_target_properties(utils PROPERTIES IMPORTED_LOCATION
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libutils.a)
add_library(ibl_lite STATIC IMPORTED)
set_target_properties(ibl_lite PROPERTIES IMPORTED_LOCATION
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libibl_lite.a)
add_library(ibl-lite STATIC IMPORTED)
set_target_properties(ibl-lite PROPERTIES IMPORTED_LOCATION
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libibl-lite.a)
add_library(filaflat STATIC IMPORTED)
set_target_properties(filaflat PROPERTIES IMPORTED_LOCATION
@@ -92,7 +92,7 @@ target_link_libraries(filament-jni
PRIVATE filaflat
PRIVATE filabridge
PRIVATE geometry
PRIVATE ibl_lite
PRIVATE ibl-lite
PRIVATE log
PRIVATE GLESv3
PRIVATE EGL

2
filament/CMakeLists.txt
View File

@@ -350,7 +350,7 @@ target_link_libraries(${TARGET} PUBLIC utils)
target_link_libraries(${TARGET} PUBLIC geometry) # TODO: remove this dependency after deprecating VertexBuffer::populateTangentQuaternions
target_link_libraries(${TARGET} PUBLIC filaflat)
target_link_libraries(${TARGET} PUBLIC filabridge)
target_link_libraries(${TARGET} PUBLIC ibl_lite)
target_link_libraries(${TARGET} PUBLIC ibl-lite)
if (FILAMENT_ENABLE_MATDBG)
target_link_libraries(${TARGET} PUBLIC matdbg)

15
libs/ibl/CMakeLists.txt
View File

@@ -37,25 +37,26 @@ add_library(${TARGET} ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
target_link_libraries(${TARGET} math utils)
add_library(${TARGET}_lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
target_compile_definitions(${TARGET}_lite PUBLIC -DFILAMENT_IBL_LITE=1)
target_include_directories(${TARGET}_lite PUBLIC ${PUBLIC_HDR_DIR})
target_link_libraries(${TARGET}_lite math utils)
add_library(${TARGET}-lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
target_compile_definitions(${TARGET}-lite PUBLIC -DFILAMENT_IBL_LITE=1)
target_include_directories(${TARGET}-lite PUBLIC ${PUBLIC_HDR_DIR})
target_link_libraries(${TARGET}-lite math utils)
# ==================================================================================================
# Compile options and optimizations
# ==================================================================================================
if (MSVC)
target_compile_options(${TARGET} PRIVATE /fp:fast)
target_compile_options(${TARGET}_lite PRIVATE /fp:fast)
target_compile_options(${TARGET}-lite PRIVATE /fp:fast)
else()
target_compile_options(${TARGET} PRIVATE -ffast-math)
target_compile_options(${TARGET}_lite PRIVATE -ffast-math)
target_compile_options(${TARGET}-lite PRIVATE -ffast-math)
endif()
# ==================================================================================================
# Installation
# ==================================================================================================
install(TARGETS ${TARGET}_lite ARCHIVE DESTINATION lib/${DIST_DIR})
install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
install(TARGETS ${TARGET}-lite ARCHIVE DESTINATION lib/${DIST_DIR})
install(DIRECTORY ${PUBLIC_HDR_DIR}/ibl DESTINATION include)