From 75e80ec4f653bb18b377c8a1d84a09f5d6d495c8 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 27 Dec 2015 13:47:54 +0100 Subject: [PATCH] Fix QT5 build on linux by adding -fPIC --- scripts/src/osd/sdl.lua | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 8b437fd9336..f07686a885e 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -321,6 +321,12 @@ project ("qtdbg_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } + configuration { "linux-*" } + buildoptions { + "-fPIC", + } + configuration { } + qtdebuggerbuild() project ("osd_" .. _OPTIONS["osd"]) @@ -384,7 +390,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm", MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h", MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm", - MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h", + MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h", MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h", } if _OPTIONS["SDL_LIBVER"]=="sdl" then @@ -453,7 +459,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/sdlsocket.cpp", MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", - MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp", MAME_DIR .. "src/osd/modules/lib/osdlib.h", MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp", @@ -488,9 +494,9 @@ if _OPTIONS["with-tools"] then kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - + dofile("sdl_cfg.lua") includedirs { @@ -498,7 +504,7 @@ if _OPTIONS["with-tools"] then MAME_DIR .. "src/lib/util", } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -549,12 +555,12 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } dofile("sdl_cfg.lua") - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end