Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-08 13:53:52 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Restore MESA_INSTALL_ROOT

Browse Source
This commit is contained in:
Vas Crabb 2015-04-01 01:00:23 +11:00
parent dbc99041c3
commit 6116f8c4fa
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -336,6 +336,10 @@ ifdef USE_DISPATCH_GL
PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)' PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
endif endif
ifdef MESA_INSTALL_ROOT
PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
endif
ifdef NO_X11 ifdef NO_X11
PARAMS += --NO_X11='$(NO_X11)' PARAMS += --NO_X11='$(NO_X11)'
endif endif

24
scripts/src/osd/sdl.lua
View File

@ -1,4 +1,13 @@
function maintargetosdoptions(_target) function maintargetosdoptions(_target)
if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
libdirs {
path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
}
linkoptions {
"-Wl,-rpath=" .. path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
}
end
if _OPTIONS["NO_X11"]~="1" then if _OPTIONS["NO_X11"]~="1" then
links { links {
"X11", "X11",
@ -131,7 +140,7 @@ end
newoption { newoption {
trigger = "USE_DISPATCH_GL", trigger = "USE_DISPATCH_GL",
description = "Use GL-dispatching", description = "Use GL-dispatching (takes precedence over MESA_INSTALL_ROOT)",
allowed = { allowed = {
{ "0", "Link to OpenGL library" }, { "0", "Link to OpenGL library" },
{ "1", "Use GL-dispatching" }, { "1", "Use GL-dispatching" },
@ -146,6 +155,11 @@ if not _OPTIONS["USE_DISPATCH_GL"] then
end end
end end
newoption {
trigger = "MESA_INSTALL_ROOT",
description = "link against specific GL-Library - also adds rpath to executable",
}
newoption { newoption {
trigger = "NO_X11", trigger = "NO_X11",
description = "Disable use of X11", description = "Disable use of X11",
@ -263,10 +277,10 @@ elseif _OPTIONS["targetos"]=="os2" then
end end
if _OPTIONS["NO_X11"]~="1" then if _OPTIONS["NO_X11"]~="1" then
linkoptions { libdirs {
"-L/usr/X11/lib", "/usr/X11/lib",
"-L/usr/X11R6/lib", "/usr/X11R6/lib",
"-L/usr/openwin/lib", "/usr/openwin/lib",
} }
if _OPTIONS["SDL_LIBVER"]=="sdl" then if _OPTIONS["SDL_LIBVER"]=="sdl" then
links { links {

4
scripts/src/osd/sdl_cfg.lua
View File

@ -14,6 +14,10 @@ else
defines { defines {
"USE_DISPATCH_GL=1", "USE_DISPATCH_GL=1",
} }
elseif _OPTIONS["MESA_INSTALL_ROOT"] then
includedirs {
path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
}
end end
end end