From 49f7c99c7786ce257fae28dfeae2f8ee5810424c Mon Sep 17 00:00:00 2001 From: Branimir Karadžić Date: Wed, 29 Mar 2017 17:09:40 +0200 Subject: Update BGFX and BX (nw) --- 3rdparty/bx/scripts/genie.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to '3rdparty/bx/scripts/genie.lua') diff --git a/3rdparty/bx/scripts/genie.lua b/3rdparty/bx/scripts/genie.lua index e0e634ae716..9919b8c6181 100644 --- a/3rdparty/bx/scripts/genie.lua +++ b/3rdparty/bx/scripts/genie.lua @@ -3,6 +3,16 @@ -- License: https://github.com/bkaradzic/bx#license-bsd-2-clause -- +newoption { + trigger = "with-amalgamated", + description = "Enable amalgamated build.", +} + +newoption { + trigger = "with-crtnone", + description = "Enable build without CRT.", +} + solution "bx" configurations { "Debug", @@ -21,10 +31,6 @@ BX_DIR = path.getabsolute("..") local BX_BUILD_DIR = path.join(BX_DIR, ".build") local BX_THIRD_PARTY_DIR = path.join(BX_DIR, "3rdparty") -defines { - "BX_CONFIG_ENABLE_MSVC_LEVEL4_WARNINGS=1" -} - dofile "toolchain.lua" toolchain(BX_BUILD_DIR, BX_THIRD_PARTY_DIR) @@ -50,7 +56,7 @@ project "bx.test" files { path.join(BX_DIR, "tests/*_test.cpp"), - path.join(BX_DIR, "tests/*_test.H"), + path.join(BX_DIR, "tests/*.h"), path.join(BX_DIR, "tests/dbg.*"), } -- cgit v1.2.3-70-g09d2