summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-04-01 07:41:46 +1100
committer Vas Crabb <vas@vastheman.com>2015-04-01 07:41:46 +1100
commiteb30b3fbb0b5127ec263d91ba09d00ec40b3b68d (patch)
tree0aa65a3c1c034959705a8f3e464532ab95bc8523
parent4d84885a297112c7f048b0137956d40c7be0dbf9 (diff)
Can't use BGFX or QT without X11 on *NIX
-rw-r--r--scripts/src/osd/sdl.lua28
1 files changed, 15 insertions, 13 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index c95272d5d93..732442d70b9 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -206,19 +206,6 @@ elseif _OPTIONS["targetos"]=="os2" then
SYNC_IMPLEMENTATION = "os2"
end
-if _OPTIONS["NO_X11"]~="1" then
- libdirs {
- "/usr/X11/lib",
- "/usr/X11R6/lib",
- "/usr/openwin/lib",
- }
- if _OPTIONS["SDL_LIBVER"]=="sdl" then
- links {
- "X11",
- }
- end
-end
-
if BASE_TARGETOS=="unix" then
if _OPTIONS["targetos"]=="macosx" then
links {
@@ -243,6 +230,21 @@ if BASE_TARGETOS=="unix" then
}
end
else
+ if _OPTIONS["NO_X11"]=="1" then
+ _OPTIONS["USE_QTDEBUG"] = "0"
+ USE_BGFX = 0
+ else
+ libdirs {
+ "/usr/X11/lib",
+ "/usr/X11R6/lib",
+ "/usr/openwin/lib",
+ }
+ if _OPTIONS["SDL_LIBVER"]=="sdl" then
+ links {
+ "X11",
+ }
+ end
+ end
linkoptions {
string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '),
}