Added Teapot & Integrated ECS

WillisMedwell · Jan 28, 2024 · c019433 · c019433
1 parent 8d2d451
commit c019433
Show file tree

Hide file tree

Showing 28 changed files with 40,168 additions and 689 deletions.
diff --git a/code/CmakePresets.json b/code/CmakePresets.json
@@ -7,51 +7,56 @@
     },
     "configurePresets": [
         {
-            "name": "gcc-ninja-release",
+            "name": "gcc-ninja",
             "description": "Build with GCC and Ninja",
             "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build/gcc-ninja-release",
+            "binaryDir": "${sourceDir}/build/gcc-ninja",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
+                "CMAKE_BUILD_TYPE": "Release",
+                "BUILD_UTILY_TESTS": "ON",
+                "BUILD_UTILY_BENCHMARKS": "ON",
+                "HAVE_STEADY_CLOCK": "0",
+                "HAVE_POSIX_REGEX": "0",
+                "HAVE_STD_REGEX": "0",
+                "HAVE_THREAD_SAFETY_ATTRIBUTES": "0"
             },
             "environment": {
                 "CC": "gcc",
                 "CXX": "g++"
             }
         },
         {
-            "name": "clang-ninja-release",
+            "name": "clang-ninja",
             "description": "Build with Clang and Ninja",
             "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build/clang-ninja-release",
+            "binaryDir": "${sourceDir}/build/clang-ninja",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
+                "CMAKE_BUILD_TYPE": "Release",
+                "BUILD_UTILY_TESTS": "ON",
+                "BUILD_UTILY_BENCHMARKS": "ON",
+                "HAVE_STEADY_CLOCK": "0",
+                "HAVE_POSIX_REGEX": "0",
+                "HAVE_STD_REGEX": "0",
+                "HAVE_THREAD_SAFETY_ATTRIBUTES": "0"
             },
             "environment": {
                 "CC": "clang",
                 "CXX": "clang++"
             }
         },
         {
-            "name": "emscripten-ninja-release",
+            "name": "emscripten-ninja",
             "description": "Build with Emscripten SDK",
             "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build/emscripten-ninja-release",
+            "binaryDir": "${sourceDir}/build/emscripten-ninja",
             "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
-            },
-            "environment": {
-                "CC": "emcc",
-                "CXX": "em++"
-            }
-        },
-        {
-            "name": "emscripten-ninja-debug",
-            "description": "Build with Emscripten SDK",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build/emscripten-ninja-debug",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
+                "CMAKE_BUILD_TYPE": "Release",
+                "BUILD_UTILY_TESTS": "ON",
+                "BUILD_UTILY_BENCHMARKS": "ON",
+                "HAVE_STEADY_CLOCK": "0",
+                "HAVE_POSIX_REGEX": "0",
+                "HAVE_STD_REGEX": "0",
+                "HAVE_THREAD_SAFETY_ATTRIBUTES": "0"
             },
             "environment": {
                 "CC": "emcc",
@@ -61,19 +66,15 @@
     ],
     "buildPresets": [
         {
-            "name": "gcc-ninja-release",
-            "configurePreset": "gcc-ninja-release"
+            "name": "gcc-ninja",
+            "configurePreset": "gcc-ninja"
         },
         {
-            "name": "clang-ninja-release",
+            "name": "clang-ninja",
             "configurePreset": "clang-ninja"
         },
         {
-            "name": "emscripten-ninja-release",
-            "configurePreset": "emscripten-ninja"
-        },
-        {
-            "name": "emscripten-ninja-debug",
+            "name": "emscripten-ninja",
             "configurePreset": "emscripten-ninja"
         }
     ]

diff --git a/code/Demos/CMakeLists.txt b/code/Demos/CMakeLists.txt
@@ -23,7 +23,6 @@ if(DEFINED EMSCRIPTEN)
     endforeach()
     message(STATUS "PRELOAD FILES: \"${PRELOAD_FILES}\"")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PRELOAD_FILES}")
-    target_compile_options(Demos PRIVATE -msimd128 -mrelaxed-simd -msse -msse2 -mavx -O0 -g -sDEMANGLE_SUPPORT=2 -sASSERTIONS=1 -sSAFE_HEAP=1 -sSTACK_OVERFLOW_CHECK=2 -sNO_DISABLE_EXCEPTION_CATCHING -Wno-unused-command-line-argument -sEXCEPTION_DEBUG=1 -v)
 else()
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
     target_compile_options(Demos PRIVATE -march=native)