Fixed: Build with profiler enabled

richardbiely · Mar 12, 2024 · dd6c809 · dd6c809
1 parent 0fad530
commit dd6c809
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 64 deletions.
diff --git a/include/gaia/config/profiler.h b/include/gaia/config/profiler.h
@@ -1,6 +1,13 @@
 #pragma once
 #include "config.h"
 
+#ifndef GAIA_PROFILER_CPU
+	#define GAIA_PROFILER_CPU 0
+#endif
+#ifndef GAIA_PROFILER_MEM
+	#define GAIA_PROFILER_MEM 0
+#endif
+
 #if GAIA_PROFILER_CPU || GAIA_PROFILER_MEM
 // Keep it small on Windows
 // TODO: What if user doesn't want this?
@@ -91,7 +98,7 @@ namespace tracy {
 // Tracy profiler GAIA implementation
 //------------------------------------------------------------------------
 
-	//! Marks the end of frame
+//! Marks the end of frame
 	#if !defined(GAIA_PROF_FRAME)
 		#define GAIA_PROF_FRAME() FrameMark
 	#endif

diff --git a/include/gaia/ecs/system_base.h b/include/gaia/ecs/system_base.h
@@ -222,9 +222,9 @@ namespace gaia {
 				if (name == nullptr) {
 					constexpr auto ct_name = meta::type_info::name<T>();
 					const size_t len = ct_name.size() >= MaxSystemNameLength ? MaxSystemNameLength : ct_name.size() + 1;
-					GAIA_SETSTR(pSystem->m_name, ct_name.data(), len);
+					GAIA_STRCPY(pSystem->m_name, len, ct_name.data());
 				} else {
-					GAIA_SETSTR(pSystem->m_name, name, MaxSystemNameLength);
+					GAIA_STRCPY(pSystem->m_name, MaxSystemNameLength, name);
 				}
 #endif
 

diff --git a/include/gaia/ecs/world.h b/include/gaia/ecs/world.h
@@ -2028,7 +2028,7 @@ namespace gaia {
 				unreg_archetype_raw(pArchetype);
 			}
 
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 			static void print_archetype_entities(const World& world, const Archetype& archetype, Entity entity, bool adding) {
 				const auto& ids = archetype.ids();
 

diff --git a/single_include/gaia.h b/single_include/gaia.h
@@ -883,6 +883,13 @@ namespace gaia {
 		}
 #endif
 
+#ifndef GAIA_PROFILER_CPU
+	#define GAIA_PROFILER_CPU 0
+#endif
+#ifndef GAIA_PROFILER_MEM
+	#define GAIA_PROFILER_MEM 0
+#endif
+
 #if GAIA_PROFILER_CPU || GAIA_PROFILER_MEM
 // Keep it small on Windows
 // TODO: What if user doesn't want this?
@@ -973,7 +980,7 @@ namespace tracy {
 // Tracy profiler GAIA implementation
 //------------------------------------------------------------------------
 
-	//! Marks the end of frame
+//! Marks the end of frame
 	#if !defined(GAIA_PROF_FRAME)
 		#define GAIA_PROF_FRAME() FrameMark
 	#endif
@@ -23849,7 +23856,7 @@ namespace gaia {
 				unreg_archetype_raw(pArchetype);
 			}
 
-#if GAIA_DEBUG
+#if GAIA_ASSERT_ENABLED
 			static void print_archetype_entities(const World& world, const Archetype& archetype, Entity entity, bool adding) {
 				const auto& ids = archetype.ids();
 
@@ -25827,9 +25834,9 @@ namespace gaia {
 				if (name == nullptr) {
 					constexpr auto ct_name = meta::type_info::name<T>();
 					const size_t len = ct_name.size() >= MaxSystemNameLength ? MaxSystemNameLength : ct_name.size() + 1;
-					GAIA_SETSTR(pSystem->m_name, ct_name.data(), len);
+					GAIA_STRCPY(pSystem->m_name, len, ct_name.data());
 				} else {
-					GAIA_SETSTR(pSystem->m_name, name, MaxSystemNameLength);
+					GAIA_STRCPY(pSystem->m_name, MaxSystemNameLength, name);
 				}
 #endif
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -255,7 +255,7 @@ if(GAIA_PROFILER_CPU OR GAIA_PROFILER_MEM)
 
       set(TRACY_ENABLE ON CACHE BOOL "TRACY_ENABLE override")
       set(TRACY_ON_DEMAND ON CACHE BOOL "TRACY_ON_DEMAND override")
-
+      
       FetchContent_MakeAvailable(tracy)
     endif()
   else()

diff --git a/src/perf/CMakeLists.txt b/src/perf/CMakeLists.txt
@@ -1,21 +1,29 @@
-add_subdirectory(iter)
-add_subdirectory(duel)
-add_subdirectory(entity)
-add_subdirectory(mt)
-add_subdirectory(app)
-
 # Preprocessor
-add_definitions(-DGAIA_DEBUG=0)
+add_compile_definitions(GAIA_DEBUG=0)
 
 # Profiler
 if(GAIA_PROFILER_CPU OR GAIA_PROFILER_MEM)
   if(GAIA_PROFILER_CPU)
-    add_compile_definitions(PRIVATE GAIA_PROFILER_CPU=1)
+    add_compile_definitions(GAIA_PROFILER_CPU=1)
   endif()
 
   if(GAIA_PROFILER_MEM)
-    add_compile_definitions(PRIVATE GAIA_PROFILER_MEM=1)
+    add_compile_definitions(GAIA_PROFILER_MEM=1)
   endif()
 
-  link_libraries(PRIVATE TracyClient)
+  link_libraries(TracyClient)
 endif()
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${picobench_SOURCE_DIR}/include)
+
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+link_libraries(Threads::Threads)
+link_libraries(picobench::picobench)
+
+add_subdirectory(iter)
+add_subdirectory(duel)
+add_subdirectory(entity)
+add_subdirectory(mt)
+add_subdirectory(app)
diff --git a/src/perf/app/CMakeLists.txt b/src/perf/app/CMakeLists.txt
@@ -1,10 +1,2 @@
 set(PROJ_NAME "gaia_perf_app")
 add_executable(${PROJ_NAME} src/main.cpp)
-
-target_include_directories(${PROJ_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${PROJ_NAME} PRIVATE ${picobench_SOURCE_DIR}/include)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJ_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJ_NAME} PRIVATE picobench::picobench)
diff --git a/src/perf/duel/CMakeLists.txt b/src/perf/duel/CMakeLists.txt
@@ -1,10 +1,2 @@
 set(PROJ_NAME "gaia_perf_duel")
 add_executable(${PROJ_NAME} src/main.cpp)
-
-target_include_directories(${PROJ_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${PROJ_NAME} PRIVATE ${picobench_SOURCE_DIR}/include)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJ_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJ_NAME} PRIVATE picobench::picobench)
diff --git a/src/perf/entity/CMakeLists.txt b/src/perf/entity/CMakeLists.txt
@@ -1,15 +1,2 @@
 set(PROJ_NAME "gaia_perf_entity")
 add_executable(${PROJ_NAME} src/main.cpp)
-
-if(MSVC)
-  # Necessary because VS might complain about too many sections used in debug builds
-  target_compile_options(${PROJ_NAME} PRIVATE /bigobj)
-endif()
-
-target_include_directories(${PROJ_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${PROJ_NAME} PRIVATE ${picobench_SOURCE_DIR}/include)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJ_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJ_NAME} PRIVATE picobench::picobench)
diff --git a/src/perf/iter/CMakeLists.txt b/src/perf/iter/CMakeLists.txt
@@ -1,10 +1,2 @@
 set(PROJ_NAME "gaia_perf_iter")
 add_executable(${PROJ_NAME} src/main.cpp)
-
-target_include_directories(${PROJ_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${PROJ_NAME} PRIVATE ${picobench_SOURCE_DIR}/include)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJ_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJ_NAME} PRIVATE picobench::picobench)
diff --git a/src/perf/mt/CMakeLists.txt b/src/perf/mt/CMakeLists.txt
@@ -1,10 +1,2 @@
 set(PROJ_NAME "gaia_perf_mt")
 add_executable(${PROJ_NAME} src/main.cpp)
-
-target_include_directories(${PROJ_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(${PROJ_NAME} PRIVATE ${picobench_SOURCE_DIR}/include)
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJ_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJ_NAME} PRIVATE picobench::picobench)
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,7 +255,7 @@ if(GAIA_PROFILER_CPU OR GAIA_PROFILER_MEM) @@
           set(TRACY_ENABLE ON CACHE BOOL "TRACY_ENABLE override")
           set(TRACY_ON_DEMAND ON CACHE BOOL "TRACY_ON_DEMAND override")
           FetchContent_MakeAvailable(tracy)
         endif()
       else()
@@ Expand Down @@