From e6cfae9e6ff94250167dd38305a989c881248030 Mon Sep 17 00:00:00 2001 From: /dev/root Date: Thu, 25 Aug 2016 18:38:45 +0200 Subject: [PATCH] latest version bitmrc --- premake/bitmrc.lua | 5 +++-- premake5.lua | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/premake/bitmrc.lua b/premake/bitmrc.lua index 5513e4d1..f5d68c1f 100644 --- a/premake/bitmrc.lua +++ b/premake/bitmrc.lua @@ -28,16 +28,17 @@ function bitmrc.project() includedirs { - path.join(bitmrc.settings.source, "src"), + path.join(bitmrc.settings.source, "BitMRC/include"), } files { - path.join(bitmrc.settings.source, "src/**.cc"), + path.join(bitmrc.settings.source, "BitMRC/**.cpp"), } removefiles { -- path.join(bitmrc.settings.source, "src/**/*test.cc"), path.join(bitmrc.settings.source, "BitMRC/main.cpp"), + path.join(bitmrc.settings.source, "BitMRC/tests/**"), } -- dependencies diff --git a/premake5.lua b/premake5.lua index 87f1a491..c1dc70a3 100644 --- a/premake5.lua +++ b/premake5.lua @@ -134,8 +134,8 @@ require "premake/pdcurses" require "premake/protobuf" require "premake/winksignals" require "premake/zlib" -require "premake/bitmrc" require "premake/libcryptopp" +require "premake/bitmrc" fmt.setup { @@ -184,14 +184,14 @@ zlib.setup }, source = path.join(depsBasePath, "zlib"), } -bitmrc.setup -{ - source = path.join(depsBasePath, "bitmrc"), -} libcryptopp.setup { source = path.join(depsBasePath, "libcryptopp"), } +bitmrc.setup +{ + source = path.join(depsBasePath, "bitmrc"), +} workspace "iw4x" location "./build" @@ -264,8 +264,8 @@ workspace "iw4x" protobuf.import() winksignals.import() zlib.import() - bitmrc.import() libcryptopp.import() + bitmrc.import() -- fix vpaths for protobuf sources vpaths @@ -365,8 +365,8 @@ workspace "iw4x" winksignals.project() zlib.project() protobuf.project() - bitmrc.project() libcryptopp.project() + bitmrc.project() rule "ProtobufCompiler" display "Protobuf compiler"