From 90a9b72aac44179b9b090f331ee590fdd121a673 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Thu, 24 Nov 2016 20:30:49 +0100 Subject: [PATCH] [Premake] Fix protobuf code generation --- premake/protobuf.lua | 12 +----------- premake5.lua | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/premake/protobuf.lua b/premake/protobuf.lua index bcb2f6f7..dab48760 100644 --- a/premake/protobuf.lua +++ b/premake/protobuf.lua @@ -37,6 +37,7 @@ function protobuf.project() files { path.join(protobuf.settings.source, "src/**.cc"), + "./src/**.proto", } removefiles { @@ -54,17 +55,6 @@ function protobuf.project() -- 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 - -- dependencies zlib.import() diff --git a/premake5.lua b/premake5.lua index 4209bfc1..ad6be8a7 100644 --- a/premake5.lua +++ b/premake5.lua @@ -300,7 +300,7 @@ workspace "iw4x" "./src/**.rc", "./src/**.hpp", "./src/**.cpp", - "./src/**.proto", + --"./src/**.proto", } includedirs { "%{prj.location}/src",