move engineinfo

.gitignore

@@ -16,4 +16,6 @@ Makefile
 /build
 /engine/obj
 /engine/lib
+/engine/util/obj
+/engine/util/bin
 /engine/doc

engine/premake5.lua

@@ -253,6 +253,8 @@ function gf_msvc_filters()
 	filter({})
 end
 
+include("util")
+
 project("GoldFish")
 	filter("options:engine=static")
 		kind("StaticLib")

engine/util/engineinfo/engineinfo.rc

@@ -0,0 +1,25 @@
+#include <windows.h>
+
+GAME ICON "../goldfish.ico"
+GOLDFISH_BMP BITMAP "../goldfish.bmp"
+
+VS_VERSION_INFO VERSIONINFO
+        FILEVERSION 0,0,0,0
+BEGIN
+        BLOCK "StringFileInfo"
+        BEGIN
+                BLOCK "040904E4"
+                BEGIN
+                        VALUE "CompanyName", "GoldFish contributors\0"
+                        VALUE "FileDescription", "GoldFish Engine Info"
+                        VALUE "LegalCopyright", "3-clause BSD, original by NishBox contributors\0"
+                        VALUE "FileVersion", "0.0.0.0\0"
+                        VALUE "ProductName", "NishBox Component\0"
+                END
+        END
+
+        BLOCK "VarFileInfo"
+        BEGIN
+                VALUE "Translation", 0x409, 65001
+        END
+END

engine/util/premake5.lua

@@ -0,0 +1,46 @@
+project("EngineInfo")
+	filter("system:windows")
+		kind("WindowedApp")
+	filter("system:not windows")
+		kind("ConsoleApp")
+	filter({})
+	language("C")
+	targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}")
+	targetname("engineinfo")
+	includedirs({
+		"../include"
+	})
+	files({
+		"engineinfo/*.c"
+	})
+	removefiles({
+		"engineinfo/main_windows.c"
+	})
+	filter("system:windows")
+		removefiles({
+			"engineinfo/main_console.c"
+		})
+		files({
+			"engineinfo/main_windows.c"
+		})
+	filter({})
+	links({
+		"GoldFish"
+	})
+	-- Call this if you are gonna use my engine...
+	gf_link_stuffs("options:engine=static")
+	filter("system:windows")
+		files({
+			"engineinfo/*.rc"
+		})
+	filter("configurations:Debug")
+		defines({
+			"DEBUG"
+		})
+		symbols("On")
+	filter("configurations:Release")
+		defines({
+			"NDEBUG"
+		})
+		optimize("On")
+	gf_msvc_filters()

premake5.lua

@@ -32,6 +32,9 @@ newaction({
 		os.rmdir("engine/bin")
 		os.rmdir("engine/obj")
 		os.rmdir("engine/lib")
+		os.rmdir("engine/util/bin")
+		os.rmdir("engine/util/obj")
+		os.rmdir("engine/util/lib")
 	end
 })
 
@@ -78,56 +81,6 @@ end
 
 include "engine"
 
-project("EngineInfo")
-	filter("system:windows")
-		kind("WindowedApp")
-	filter("system:not windows")
-		kind("ConsoleApp")
-	filter({})
-	language("C")
-	targetdir("bin/%{cfg.buildcfg}/%{cfg.platform}")
-	targetname("nishbox_engineinfo")
-	includedirs({
-		"engine/include"
-	})
-	files({
-		"src/engineinfo/*.c"
-	})
-	removefiles({
-		"src/engineinfo/main_windows.c"
-	})
-	filter("system:windows")
-		removefiles({
-			"src/engineinfo/main_console.c"
-		})
-		files({
-			"src/engineinfo/main_windows.c"
-		})
-	filter({})
-	links({
-		"GoldFish"
-	})
-	-- Call this if you are gonna use my engine...
-	gf_link_stuffs("options:engine=static")
-	filter("system:windows")
-		defines({
-			"FD_ENGINEINFO"
-		})
-		files({
-			"src/*.rc"
-		})
-	filter("configurations:Debug")
-		defines({
-			"DEBUG"
-		})
-		symbols("On")
-	filter("configurations:Release")
-		defines({
-			"NDEBUG"
-		})
-		optimize("On")
-	msvc_filters()
-
 project("NishBoxServer")
 	kind("ConsoleApp")
 	language("C")

src/nishbox.rc

@@ -6,15 +6,8 @@
 #ifdef FD_SERVER
 #define FILE_DESCRIPTION "NishBox Dedicated Server\0"
 #endif
-#ifdef FD_ENGINEINFO
-#define FILE_DESCRIPTION "GoldFish Engine Info\0"
-#endif
 
-#ifdef FD_ENGINEINFO
-GAME ICON "./internal/goldfish.ico"
-#else
 GAME ICON "./internal/icon.ico"
-#endif
 GOLDFISH_BMP BITMAP "./internal/goldfish.bmp"
 
 VS_VERSION_INFO VERSIONINFO
@@ -26,7 +19,7 @@ BEGIN
                 BEGIN
                         VALUE "CompanyName", "NishBox contributors\0"
                         VALUE "FileDescription", FILE_DESCRIPTION
-                        VALUE "LegalCopyright", "Public domain, original by NishBox contributors\0"
+                        VALUE "LegalCopyright", "3-clause BSD, original by NishBox contributors\0"
                         VALUE "FileVersion", "0.0.0.0\0"
                         VALUE "ProductName", "NishBox Component\0"
                 END

tool/clean.sh

@@ -2,3 +2,5 @@
 rm -rf obj lib bin *.make Makefile
 cd engine
 rm -rf obj lib bin *.make Makefile
+cd util
+rm -rf obj lib bin *.make Makefile