Skip to content
Permalink
Browse files

Backport https://github.com/RetroPie/RetroPie-Setup/blob/master/scrip…

  • Loading branch information...
twinaphex committed Jul 8, 2019
1 parent e06d731 commit efc37c9968fe24af8d91d9ce6022e080a1fd90c3
Showing with 24 additions and 1 deletion.
  1. +2 −0 Makefile.libretro
  2. +13 −0 scripts/genie.lua
  3. +2 −0 scripts/src/3rdparty.lua
  4. +7 −1 scripts/src/main.lua
@@ -55,6 +55,8 @@ VERBOSE ?= 1
# scripts/toolchain.lua)
# PTR64 = 1

USE_BGFX ?= 0

###########################################################################
#
# LIBRETRO PLATFORM GUESSING
@@ -387,8 +387,21 @@ newoption {
description = "Arguments for running debug build.",
}

newoption {
trigger = "USE_BGFX",
description = "Use bgfx.",
allowed = {
{ "0", "Disabled" },
{ "1", "Enabled" },
}
}

dofile ("extlib.lua")

if not _OPTIONS["USE_BGFX"] then
_OPTIONS["USE_BGFX"] = "0"
end

if _OPTIONS["SHLIB"]=="1" then
LIBTYPE = "SharedLib"
else
@@ -717,6 +717,7 @@ end
-- BGFX library objects
--------------------------------------------------

if not _OPTIONS["use_bgfx"]=="0" then
project "bgfx"
uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a"
kind "StaticLib"
@@ -872,6 +873,7 @@ end
MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
}
end
end

--------------------------------------------------
-- PortAudio library objects
@@ -294,8 +294,14 @@ end
ext_lib("portmidi"),
}
end

if _OPTIONS["USE_BGFX"]~="0" then
links {
"bgfx",
}
end
links {
"bgfx",
-- "bgfx",
"ocore_" .. _OPTIONS["osd"],
}

2 comments on commit efc37c9

@twinaphex

This comment has been minimized.

Copy link
Member Author

replied Jul 8, 2019

@joolswills You should be able to get rid of this now -

RetroPie/RetroPie-Setup@848424c

@joolswills

This comment has been minimized.

Copy link

replied Jul 8, 2019

thanks.

Please sign in to comment.
You can’t perform that action at this time.