diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/modules.lua | 10 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 8 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index ca68f1af83d..c8e1efee2c9 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -107,11 +107,11 @@ function osdmodulesbuild() configuration { } elseif _OPTIONS["targetos"]=="macosx" then buildoptions { - "-F" .. string.gsub(os.outputof("qmake -query QT_INSTALL_LIBS"), '[\r\n]+', ''), + "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } else buildoptions { - string.gsub(os.outputof("pkg-config --cflags QtGui"), '[\r\n]+', ' '), + backtick("pkg-config --cflags QtGui"), } end else @@ -146,7 +146,7 @@ function osdmodulestargetconf() if _OPTIONS["NO_USE_MIDI"]~="1" then if _OPTIONS["targetos"]=="linux" then linkoptions { - string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '), + backtick("pkg-config --libs alsa"), } elseif _OPTIONS["targetos"]=="macosx" then links { @@ -168,7 +168,7 @@ function osdmodulestargetconf() } elseif _OPTIONS["targetos"]=="macosx" then linkoptions { - "-F" .. string.gsub(os.outputof("qmake -query QT_INSTALL_LIBS"), '[\r\n]+', ''), + "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } links { "QtCore.framework", @@ -176,7 +176,7 @@ function osdmodulestargetconf() } else linkoptions { - string.gsub(os.outputof("pkg-config --libs QtGui"), '[\r\n]+', ' '), + backtick("pkg-config --libs QtGui"), } end end diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 24c08f4de5a..3943dcef7a3 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -38,7 +38,7 @@ function maintargetosdoptions(_target) } end linkoptions { - string.gsub(os.outputof("pkg-config --libs fontconfig"), '[\r\n]+', ' '), + backtick("pkg-config --libs fontconfig"), } end @@ -230,7 +230,7 @@ if BASE_TARGETOS=="unix" then end else linkoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'"), } end else @@ -250,7 +250,7 @@ if BASE_TARGETOS=="unix" then end end linkoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --libs"), } if _OPTIONS["targetos"]~="haiku" then links { @@ -271,7 +271,7 @@ if BASE_TARGETOS=="unix" then end elseif BASE_TARGETOS=="os2" then linkoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --libs"), } links { "pthread" diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 7f990ed31e6..775398f87a6 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -44,7 +44,7 @@ end if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then buildoptions { - string.gsub(os.outputof("pkg-config --cflags alsa"), '[\r\n]+', ' '), + backtick("pkg-config --cflags alsa"), } end @@ -83,16 +83,16 @@ if BASE_TARGETOS=="unix" then "MACOSX_USE_LIBSDL", } buildoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), } end else buildoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --cflags"), } if _OPTIONS["targetos"]~="emscripten" then buildoptions { - string.gsub(os.outputof("pkg-config --cflags fontconfig"), '[\r\n]+', ' '), + backtick("pkg-config --cflags fontconfig"), } end end @@ -127,6 +127,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then } elseif _OPTIONS["targetos"]=="os2" then buildoptions { - string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '), + backtick(sdlconfigcmd() .. " --cflags"), } end |