From 95a2e4c2c6b8bfa4262a4659ce3647aafaa323fb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 19 Mar 2016 16:09:00 +0100 Subject: [PATCH] compile BGFX for RPI as well (nw) --- scripts/genie.lua | 7 +++++++ scripts/src/3rdparty.lua | 8 ++++++++ scripts/src/main.lua | 3 +++ scripts/toolchain.lua | 6 +++--- src/osd/modules/render/drawbgfx.cpp | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index ff6872a5f36..44339afb921 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1128,6 +1128,13 @@ configuration { "rpi" } links { "SDL2", "fontconfig", + "X11", + "GLESv2", + "EGL", + "bcm_host", + "vcos", + "vchiq_arm", + "pthread", } configuration { "osx* or xcode4" } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 525789a92f1..c4d93c73348 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -726,6 +726,14 @@ end "-Wno-uninitialized", "-Wno-unused-function", } + configuration { "rpi" } + buildoptions { + "-Wno-unused-but-set-variable", + "-Wno-unused-variable", + } + defines { + "__STDC_VERSION__=199901L", + } configuration { } diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 18a5b28210f..a517c39092b 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -103,6 +103,9 @@ end configuration { "mingw*" or "vs*" } targetextension ".exe" + configuration { "rpi" } + targetextension "" + configuration { "asmjs" } targetextension ".bc" if os.getenv("EMSCRIPTEN") then diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 072f4b214ea..408237d783e 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -531,9 +531,9 @@ function toolchain(_buildDir, _subDir) "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vcos/pthreads", "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vmcs_host/linux", } - links { - "rt", - } + defines { + "__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it. + } linkoptions { "-Wl,--gc-sections", } diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index b9e3c2626e6..88257150abd 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -84,7 +84,7 @@ static void* sdlNativeWindowHandle(SDL_Window* _window) return nullptr; } -# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD +# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD || BX_PLATFORM_RPI return (void*)wmi.info.x11.window; # elif BX_PLATFORM_OSX return wmi.info.cocoa.window;