From a03936753a7b4e7a94b48a17a2bc9c449bac52f7 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:52:55 +0300 Subject: [PATCH] build proto files is a separate folder than dll/ --- premake5.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/premake5.lua b/premake5.lua index e00fdcc9..e367e295 100644 --- a/premake5.lua +++ b/premake5.lua @@ -89,7 +89,7 @@ local function genproto() end local protoc_exe = path.join(deps_dir, 'protobuf', deps_install_prefix, 'bin', 'protoc') - local out_dir = 'dll/proto_gen/' .. os_iden + local out_dir = 'proto_gen/' .. os_iden if os.host() == "windows" then protoc_exe = protoc_exe .. '.exe' @@ -167,7 +167,7 @@ local common_emu_defines = { -- added to all filters, later defines will be appe --------- local common_include = { 'dll', - 'dll/proto_gen/' .. os_iden, + 'proto_gen/' .. os_iden, 'libs', 'libs/utfcpp', 'helpers', @@ -212,10 +212,10 @@ local common_files = { -- dll/ "dll/*.cpp", "dll/*.c", "dll/*.hpp", "dll/*.h", - -- dll/proto_gen/ - 'dll/proto_gen/' .. os_iden .. '/*.cc', 'dll/proto_gen/' .. os_iden .. '/*.h', -- controller "controller/gamepad.c", "controller/controller/gamepad.h", + -- proto_gen/ + 'proto_gen/' .. os_iden .. '/**', -- crash_printer/ 'crash_printer/' .. os_iden .. '.cpp', 'crash_printer/crash_printer/' .. os_iden .. '.hpp', -- helpers/ @@ -471,6 +471,9 @@ vpaths { -- just for visual niceness, see: https://premake.github.io/docs/vpaths ["asm/*"] = { "**.s", "**.asm", }, + ["proto/*"] = { + "**.proto", + }, }