Use built-in cmake unity build (#67)

ahugeat · web-flow · commit cf82bb2542f5 · 2023-01-12T17:24:17.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,6 @@ option(GF_BUILD_WITH_OPENGL3 "Build with OpenGL 3.3 instead of OpenGL ES 2.0" OF
 option(GF_BUILD_EXAMPLES "Build examples" ON)
 option(GF_BUILD_DOCUMENTATION "Build documentation (needs Doxygen)" ON)
 option(GF_BUILD_GAMES "Build games" OFF)
-option(GF_SINGLE_COMPILTATION_UNIT "Build the library in a single file (unity build)" OFF)
 option(GF_USE_EMBEDDED_LIBS "Build the library with the submodule libraries" ON)
 
 if(UNIX)
diff --git a/docs/snippets/doc_class_clock.cc b/docs/snippets/doc_class_clock.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Clock.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyClockUsage() {
 
diff --git a/docs/snippets/doc_class_console.cc b/docs/snippets/doc_class_console.cc
@@ -21,8 +21,7 @@
 #include <gf/Color.h>
 #include <gf/Console.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyConsoleUsage(gf::ConsoleFont& font) {
   gf::Vector2i size(70, 40);
diff --git a/docs/snippets/doc_class_flags.cc b/docs/snippets/doc_class_flags.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Flags.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 /// [flags_def]
 enum class AnimalProperties {
diff --git a/docs/snippets/doc_class_rect.cc b/docs/snippets/doc_class_rect.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Rect.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyRectUsage() {
   /// [rect]
diff --git a/docs/snippets/doc_class_time.cc b/docs/snippets/doc_class_time.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Time.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyTimeUsage() {
   /// [time]
diff --git a/docs/snippets/doc_gamedev_101.cc b/docs/snippets/doc_gamedev_101.cc
@@ -24,8 +24,7 @@
 #include <gf/ResourceManager.h>
 #include <gf/Texture.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 /// [entity]
 class MyEntity : public gf::Entity {
diff --git a/docs/snippets/doc_struct_blend_mode.cc b/docs/snippets/doc_struct_blend_mode.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Blend.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyBlendModeUsage() {
 
diff --git a/docs/snippets/doc_struct_circ.cc b/docs/snippets/doc_struct_circ.cc
@@ -20,8 +20,7 @@
  */
 #include <gf/Circ.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 void dummyCircUsage() {
 
diff --git a/docs/snippets/doc_tutorial_id.cc b/docs/snippets/doc_tutorial_id.cc
@@ -25,8 +25,7 @@
 
 #include <gf/Id.h>
 
-template <typename... Args>
-constexpr void unused(Args&&...) { }
+#include "doc_utils.h"
 
 /// [using]
 using namespace gf::literals; // necessary to use _id
diff --git a/docs/snippets/doc_utils.h b/docs/snippets/doc_utils.h
@@ -19,10 +19,10 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-/*
- * This file is meant for single compilation unit (a.k.a. unity build)
- * See: https://en.wikipedia.org/wiki/Single_Compilation_Unit
- */
+#ifndef GF_DOC_UTILS
+#define GF_DOC_UTILS
+
+template <typename... Args>
+constexpr void unused(Args&&...) { }
 
-#include "local/Board.cc"
-#include "local/Grid.cc"
+#endif // GF_DOC_UTILS
diff --git a/games/gf_2048/CMakeLists.txt b/games/gf_2048/CMakeLists.txt
@@ -2,18 +2,11 @@
 set(GF_2048_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/games/gf_2048")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/code/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
 
-if (GF_SINGLE_COMPILTATION_UNIT)
-  add_executable(gf_2048
-    code/gf_2048.cc
-    code/XUnityBuild.cc
-  )
-else()
-  add_executable(gf_2048
-    code/gf_2048.cc
-    code/local/Board.cc
-    code/local/Grid.cc
-  )
-endif()
+add_executable(gf_2048
+  code/gf_2048.cc
+  code/local/Board.cc
+  code/local/Grid.cc
+)
 
 target_include_directories(gf_2048
   PRIVATE
diff --git a/games/gf_pong/CMakeLists.txt b/games/gf_pong/CMakeLists.txt
@@ -1,18 +1,11 @@
-if (GF_SINGLE_COMPILTATION_UNIT)
-  add_executable(gf_pong
-    gf_pong.cc
-    XUnityBuild.cc
-  )
-else()
-  add_executable(gf_pong
-    gf_pong.cc
-    local/Ball.cc
-    local/Ground.cc
-    local/Paddle.cc
-    local/Points.cc
-    local/Singletons.cc
-  )
-endif()
+add_executable(gf_pong
+  gf_pong.cc
+  local/Ball.cc
+  local/Ground.cc
+  local/Paddle.cc
+  local/Points.cc
+  local/Singletons.cc
+)
 
 target_include_directories(gf_pong
   PRIVATE
diff --git a/games/gf_pong/XUnityBuild.cc b/games/gf_pong/XUnityBuild.cc
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
diff --git a/library/core/XUnityBuild.cc b/library/core/XUnityBuild.cc
diff --git a/library/graphics/XUnityBuild.cc b/library/graphics/XUnityBuild.cc
diff --git a/library/net/XUnityBuild.cc b/library/net/XUnityBuild.cc
