Previous 199869 Revisions Next

r36833 Tuesday 31st March, 2015 at 14:21:59 UTC by Vasantha Crabb
Restore MESA_INSTALL_ROOT
[/trunk]makefile
[scripts/src/osd]sdl.lua sdl_cfg.lua

trunk/makefile
r245344r245345
336336PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
337337endif
338338
339ifdef MESA_INSTALL_ROOT
340PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
341endif
342
339343ifdef NO_X11
340344PARAMS += --NO_X11='$(NO_X11)'
341345endif
trunk/scripts/src/osd/sdl.lua
r245344r245345
11function maintargetosdoptions(_target)
2   if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
3      libdirs {
4         path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
5      }
6      linkoptions {
7         "-Wl,-rpath=" .. path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
8      }
9   end
10
211   if _OPTIONS["NO_X11"]~="1" then
312      links {
413         "X11",
r245344r245345
131140
132141newoption {
133142   trigger = "USE_DISPATCH_GL",
134   description = "Use GL-dispatching",
143   description = "Use GL-dispatching (takes precedence over MESA_INSTALL_ROOT)",
135144   allowed = {
136145      { "0",  "Link to OpenGL library"  },
137146      { "1",  "Use GL-dispatching"      },
r245344r245345
147156end
148157
149158newoption {
159   trigger = "MESA_INSTALL_ROOT",
160   description = "link against specific GL-Library - also adds rpath to executable",
161}
162
163newoption {
150164   trigger = "NO_X11",
151165   description = "Disable use of X11",
152166   allowed = {
r245344r245345
263277end
264278
265279if _OPTIONS["NO_X11"]~="1" then
266   linkoptions {
267      "-L/usr/X11/lib",
268      "-L/usr/X11R6/lib",
269      "-L/usr/openwin/lib",
280   libdirs {
281      "/usr/X11/lib",
282      "/usr/X11R6/lib",
283      "/usr/openwin/lib",
270284   }
271285   if _OPTIONS["SDL_LIBVER"]=="sdl" then
272286      links {
trunk/scripts/src/osd/sdl_cfg.lua
r245344r245345
1414      defines {
1515         "USE_DISPATCH_GL=1",
1616      }
17   elseif _OPTIONS["MESA_INSTALL_ROOT"] then
18      includedirs {
19         path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
20      }
1721   end
1822end
1923


Previous 199869 Revisions Next


© 1997-2024 The MAME Team