Merge branch 'master' into aabr

zenustech · Jul 28, 2023 · 4cf0fba · 4cf0fba
2 parents e09685a + 7e5f957
commit 4cf0fba
Show file tree

Hide file tree

Showing 74 changed files with 121,071 additions and 2,168 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -166,6 +166,8 @@ function (zeno_add_asset_dir dir)
 endfunction()
 ## --- end cihou asset dir
 
+add_subdirectory(zeno)
+
 ## --- begin cihou perf-geeks
 if (ZENO_MARCH_NATIVE)
     if (MSVC)
@@ -183,8 +185,6 @@ if (ZENO_USE_FAST_MATH)
 endif()
 ## --- end cihou perf-geeks
 
-add_subdirectory(zeno)
-
 target_compile_options(zeno
             PUBLIC $<$<COMPILE_LANGUAGE:CXX>: $<IF:$<CXX_COMPILER_ID:MSVC>, /utf-8, >>
             )

diff --git a/hdr/studio_small_08_1k.hdr b/hdr/studio_small_08_1k.hdr