premake5: Automatic compiling of protobuf definition files.

- Added custom rules for *.proto files to iw4x
- Added a workaround for protoc output not being automatically included
- Disable precompiled headers for protobuf generated sources
- Moved inclusion of node.pb.h out of STDInclude.hpp to only where it's necessary (WTF @momo5502)
- Removed protobuf-generated code from "protobuf" external project
- Removed protogen.bat as it is no longer needed

premake5.lua

@@ -1,3 +1,6 @@
+-- protoc tool
+protocBinPath = path.translate(path.join(_MAIN_SCRIPT_DIR, "tools", "protoc.exe"))
+
 -- Option to allow copying the DLL file to a custom folder after build
 newoption {
 	trigger = "copy-to",
@@ -90,13 +93,23 @@ workspace "iw4x"
 	project "iw4x"
 		kind "SharedLib"
 		language "C++"
-		files { "./src/**.hpp", "./src/**.cpp" }
+		files {
-		includedirs { "%{prj.location}/src", "./src" }
+			"./src/**.hpp",
+			"./src/**.cpp",
+			"./src/**.proto",
+		}
+		includedirs {
+			"%{prj.location}/src",
+			"./src"
+		}
 
 		-- Pre-compiled header
 		pchheader "STDInclude.hpp" -- must be exactly same as used in #include directives
 		pchsource "src/STDInclude.cpp" -- real path
 		buildoptions { "/Zm100" }
+		filter "files:**.pb.*"
+			flags { "NoPCH" }
+		filter {}
 
 		-- Dependency on zlib, json11 and asio
 		links { "zlib", "json11", "pdcurses", "libtomcrypt", "libtommath", "protobuf" }
@@ -116,7 +129,9 @@ workspace "iw4x"
 		if not _OPTIONS["no-new-structure"] then
 			vpaths {
 				["Headers/*"] = { "./src/**.hpp" },
-				["Sources/*"] = { "./src/**.cpp" }
+				["Sources/*"] = { "./src/**.cpp" },
+				["Proto/Definitions/*"] = { "./src/Proto/**.proto" },
+				["Proto/Generated/*"] = { "**.pb.*" }, -- meh.
 			}
 		end
 
@@ -143,6 +158,23 @@ workspace "iw4x"
 
 		configuration "Release*"
 			flags { "FatalCompileWarnings" }
+		configuration {}
+
+		-- Generate source code from protobuf definitions
+		rules { "ProtobufCompiler" }
+
+		-- Workaround: Consume protobuf generated source files
+		matches = os.matchfiles(path.join("src/Proto/**.proto"))
+		for i, srcPath in ipairs(matches) do
+			basename = path.getbasename(srcPath)
+			files {
+				string.format("%%{prj.location}/src/proto/%s.pb.h", basename),
+				string.format("%%{prj.location}/src/proto/%s.pb.cc", basename),
+			}
+		end
+		includedirs {
+			"%{prj.location}/src/proto"
+		}
 
 	group "External dependencies"
 
@@ -261,10 +293,7 @@ workspace "iw4x"
 
 			-- default protobuf sources
 			files { "./deps/protobuf/src/**.cc" }
-			
+
-			-- our generated sources
-			files { "./%{prj.location}/src/proto/**.cc" }
-			
 			-- remove unnecessary sources
 			removefiles 
 			{ 
@@ -284,3 +313,19 @@ workspace "iw4x"
 
 			-- always build as static lib, as we include our custom classes and therefore can't perform shared linking
 			kind "StaticLib"
+
+rule "ProtobufCompiler"
+	display "Protobuf compiler"
+	location "./build"
+	fileExtension ".proto"
+	buildmessage "Compiling %(Identity) with protoc..."
+	buildcommands {
+		'@echo off',
+		'path "$(SolutionDir)\\..\\tools"',
+		'if not exist "$(ProjectDir)\\src\\proto" mkdir "$(ProjectDir)\\src\\proto"',
+		'protoc --error_format=msvs -I=%(RootDir)%(Directory) "--cpp_out=$(ProjectDir)\\src\\proto" "%(FullPath)"',
+	}
+	buildoutputs {
+		'$(ProjectDir)\\src\\proto\\%(Filename).pb.cc',
+		'$(ProjectDir)\\src\\proto\\%(Filename).pb.h',
+	}

src/Components/Modules/Node.hpp

@@ -6,6 +6,9 @@
 #define NODE_STORE_INTERVAL    1000 * 60* 1   // Store nodes every minute
 #define SESSION_TIMEOUT        1000 * 10      // 10 seconds session timeout
 
+// Protobuf
+#include "proto/node.pb.h"
+
 namespace Components
 {
 	class Node : public Component

src/STDInclude.hpp

@@ -61,9 +61,6 @@
 #include <tomcrypt.h>
 #include <wink/signal.hpp>
 
-// Protobuf
-#include <proto/node.pb.h>
-
 #pragma warning(pop)
 
 // Version number

tools/protogen.bat

@@ -1,4 +1,4 @@
 pushd "%~dp0"
 mkdir "..\build\src\proto" 2>NUL
-protoc.exe -I=proto --cpp_out=../build/src/proto/ proto/node.proto
+protoc.exe -I=../src/Proto --cpp_out=../build/src/proto/ ../src/Proto/node.proto
 popd