From 00ad4ab0ae803c0a023fcbe5b0e1615e2cc87568 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 5 Feb 2017 14:15:25 +0100 Subject: [PATCH] Update build scripts, BX is now static library (nw) --- scripts/src/3rdparty.lua | 59 ++++++++++++++++++++++++++++++++++++++++ scripts/src/main.lua | 1 + 2 files changed, 60 insertions(+) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index e5b64df3ac0..e6a0296ee78 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -730,6 +730,65 @@ links { } end end + +-------------------------------------------------- +-- BX library objects +-------------------------------------------------- + +project "bx" + uuid "238318fe-49f5-4eb4-88be-0618900f5eac" + kind "StaticLib" + + defines { + "__STDC_LIMIT_MACROS", + "__STDC_FORMAT_MACROS", + "__STDC_CONSTANT_MACROS", + } + + configuration { "vs*" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/msvc", + } + configuration { "mingw*" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/mingw", + } + + configuration { "osx* or xcode4" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/osx", + } + + configuration { "freebsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + + configuration { "netbsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + + configuration { } + + includedirs { + MAME_DIR .. "3rdparty/bx/include", + } + + files { + MAME_DIR .. "3rdparty/bx/src/commandline.cpp", + MAME_DIR .. "3rdparty/bx/src/crt.cpp", + MAME_DIR .. "3rdparty/bx/src/crtimpl.cpp", + MAME_DIR .. "3rdparty/bx/src/debug.cpp", + MAME_DIR .. "3rdparty/bx/src/dtoa.cpp", + MAME_DIR .. "3rdparty/bx/src/fpumath.cpp", + MAME_DIR .. "3rdparty/bx/src/mutex.cpp", + MAME_DIR .. "3rdparty/bx/src/os.cpp", + MAME_DIR .. "3rdparty/bx/src/sem.cpp", + MAME_DIR .. "3rdparty/bx/src/string.cpp", + MAME_DIR .. "3rdparty/bx/src/thread.cpp", + } + -------------------------------------------------- -- BGFX library objects -------------------------------------------------- diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 0a92b1fed57..3c7429b935e 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -301,6 +301,7 @@ end end links { "bgfx", + "bx", "ocore_" .. _OPTIONS["osd"], }