Fix c4group target generating C4ResStrTableGenerated.{cpp,h}

legacyclonk · Jun 29, 2024 · a03f206 · a03f206
1 parent 47db48f
commit a03f206
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/C4Config.cpp b/src/C4Config.cpp
@@ -18,14 +18,14 @@
 
 #include <C4Config.h>
 
-#include <C4UpperBoard.h>
 #include "C4Version.h"
 #ifdef C4ENGINE
 #include <C4Application.h>
 #include <C4Log.h>
 #include <C4Network2.h>
 #include <C4Language.h>
 #include "C4ResStrTable.h"
+#include <C4UpperBoard.h>
 #endif
 
 #include <StdFile.h>

diff --git a/src/C4Group.cpp b/src/C4Group.cpp
@@ -22,9 +22,12 @@
 
 #include <C4Components.h>
 #include <C4InputValidation.h>
-#include "C4Log.h"
 #include "StdConfig.h"
 
+#ifdef C4ENGINE
+#include "C4Log.h"
+#endif
+
 #ifdef _WIN32
 #include <sys/utime.h>
 #include <shellapi.h>

diff --git a/src/C4InputValidation.cpp b/src/C4InputValidation.cpp
@@ -18,7 +18,6 @@
 // user input validation functions
 
 #include <C4InputValidation.h>
-#include <C4Log.h>
 #include <C4Config.h>
 
 #ifdef C4ENGINE

diff --git a/src/C4Update.cpp b/src/C4Update.cpp
@@ -20,7 +20,6 @@
 #include "C4Config.h"
 #include "C4Components.h"
 #include "C4Group.h"
-#include "C4Log.h"
 
 #include <format>
 #include <print>