From 511762fa2d25965d05fc277efd29fb4a50d95420 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 31 May 2015 13:20:42 +0200 Subject: Allow compiling with shared libraries [O. Galibert] Put SHLIB=1 in the main makefile, or on the command line. The idea is to get a *way* faster link with symbols. It works at least on linux, with one annoying caveat: you have to be in the build/projects/sdl/mame/gmake-linux directory to start mame afterwards. We're going to move some things around to be able to use LD_LIBRARY_PATH or have it start as-is from the root. --- scripts/src/osd/sdl.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/src/osd/sdl.lua') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 2c8e2ed51c5..0fc7d57d3b9 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -293,8 +293,9 @@ end project ("osd_" .. _OPTIONS["osd"]) + targetsubdir(_OPTIONS["target"] .."_" .._OPTIONS["subtarget"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) dofile("sdl_cfg.lua") osdmodulesbuild() @@ -361,8 +362,9 @@ project ("osd_" .. _OPTIONS["osd"]) project ("ocore_" .. _OPTIONS["osd"]) + targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) - kind "StaticLib" + kind (LIBTYPE) options { "ForceCPP", -- cgit v1.2.3-70-g09d2 From 6cd8271575238fef0f1d8c57d936b3e470a6916a Mon Sep 17 00:00:00 2001 From: Cesare Falco Date: Sat, 6 Jun 2015 16:32:04 +0200 Subject: Added new SDL_INI_PATH flag --- makefile | 5 +++++ scripts/src/osd/sdl.lua | 5 +++++ scripts/src/osd/sdl_cfg.lua | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'scripts/src/osd/sdl.lua') diff --git a/makefile b/makefile index e96640a0d05..ef9b07f7381 100644 --- a/makefile +++ b/makefile @@ -27,6 +27,7 @@ # USE_DISPATCH_GL = 0 # DIRECTINPUT = 7 # USE_SDL = 1 +# SDL_INI_PATH = .;$HOME/.mame/;ini; # SDL2_MULTIAPI = 1 # NO_USE_MIDI = 1 # DONT_USE_NETWORK = 1 @@ -474,6 +475,10 @@ ifdef USE_SDL PARAMS += --USE_SDL='$(USE_SDL)' endif +ifdef SDL_INI_PATH +PARAMS += --SDL_INI_PATH='$(SDL_INI_PATH)' +endif + ifdef CYGWIN_BUILD PARAMS += --CYGWIN_BUILD='$(CYGWIN_BUILD)' endif diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 0fc7d57d3b9..0358881562f 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -101,6 +101,11 @@ newoption { description = "link against specific GL-Library - also adds rpath to executable (overridden by USE_DISPATCH_GL)", } +newoption { + trigger = "SDL_INI_PATH", + description = "Default search path for .ini files", +} + newoption { trigger = "NO_X11", description = "Disable use of X11", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index a26d80f197b..a204201d6f5 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -18,6 +18,11 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[ } end +if _OPTIONS["SDL_INI_PATH"]~=nil then + defines { + "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", + } +end if _OPTIONS["NO_X11"]=="1" then defines { -- cgit v1.2.3-70-g09d2