diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /scripts/genie.lua | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 12ef7bdf58d..5a7748bd5cb 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -114,6 +114,7 @@ newoption { { "haiku", "Haiku" }, { "solaris", "Solaris SunOS" }, { "steamlink", "Steam Link" }, + { "rpi", "Raspberry Pi" }, }, } @@ -574,7 +575,9 @@ configuration { "Debug" } defines { "MAME_DEBUG", "MAME_PROFILER", + "BGFX_CONFIG_DEBUG=1", } + if _OPTIONS["FASTDEBUG"]=="1" then defines { "MAME_DEBUG_FAST" @@ -816,7 +819,7 @@ configuration { "mingw-clang" } } configuration { } - -- add the error warning flag +-- add the error warning flag if _OPTIONS["NOWERROR"]==nil then buildoptions { "-Werror", @@ -1059,6 +1062,7 @@ configuration { "asmjs" } buildoptions { "-std=gnu89", "-Wno-implicit-function-declaration", + "-s USE_SDL_TTF=2", } buildoptions_cpp { "-x c++", @@ -1097,7 +1101,7 @@ configuration { "pnacl" } } archivesplit_size "20" -configuration { "linux-*" } +configuration { "linux-* or rpi"} links { "dl", "rt", @@ -1122,6 +1126,19 @@ configuration { "steamlink" } "EGL_API_FB", } +configuration { "rpi" } + links { + "SDL2", + "fontconfig", + "X11", + "GLESv2", + "EGL", + "bcm_host", + "vcos", + "vchiq_arm", + "pthread", + } + configuration { "osx* or xcode4" } links { "pthread", @@ -1280,6 +1297,7 @@ end } configuration { "vs2015" } buildoptions { + "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter "/wd4458", -- warning C4458: declaration of 'xxx' hides class member |