From 42fbb9c3967fcda37f2d9ae17d5796a79cf027b9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 13 Mar 2016 13:54:57 +1100 Subject: Make osd_file a polymorphic class that's held with smart pointers Make avi_file a class that's held with smart pointers, encapsulate various AVI I/O structures Make zip_file and _7z_file classes rather than having free functions everywhere Hide zip/7z class implementation behind an interface, no longer need to call close() to send back to the cache Don't dump as much crap in global namespace Add solaris PTY implementation Improve variable expansion for SDL OSD - supports ~/$FOO/${BAR} syntax Rearrange stuff so the same things are in file module for all OSDs Move file stuff into its own module 7z/zip open and destruct are still not thread-safe due to lack of interlocks around cache access Directory functions still need to be moved to file module SDL OSD may not initialise WinSock on Windows --- scripts/src/osd/osdmini.lua | 2 +- scripts/src/osd/sdl.lua | 25 +++++++++++++++++++++---- scripts/src/osd/windows.lua | 10 ++++++---- 3 files changed, 28 insertions(+), 9 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 52a28147c32..7748ff8a419 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -120,9 +120,9 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/osdmini/minidir.cpp", - MAME_DIR .. "src/osd/osdmini/minifile.cpp", MAME_DIR .. "src/osd/osdmini/minimisc.cpp", MAME_DIR .. "src/osd/osdmini/minitime.cpp", + MAME_DIR .. "src/osd/modules/file/stdfile.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.h", MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 5f5fb45ff53..948ca7d26b3 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -360,6 +360,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", MAME_DIR .. "src/osd/sdl", @@ -460,10 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/sdl/sdldir.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.h", - MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp", - 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", @@ -474,6 +471,26 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", } + if BASE_TARGETOS=="unix" then + files { + MAME_DIR .. "src/osd/modules/file/posixfile.cpp", + MAME_DIR .. "src/osd/modules/file/posixfile.h", + MAME_DIR .. "src/osd/modules/file/posixptty.cpp", + MAME_DIR .. "src/osd/modules/file/posixsocket.cpp", + } + elseif BASE_TARGETOS=="win32" then + files { + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", + } + else + files { + MAME_DIR .. "src/osd/modules/file/stdfile.cpp", + } + end + if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/sdl/osxutils.h", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 44e29f12eab..97880e4a260 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -144,6 +144,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } @@ -220,6 +221,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -245,19 +247,19 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", MAME_DIR .. "src/osd/windows/windir.cpp", - MAME_DIR .. "src/osd/windows/winfile.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", - MAME_DIR .. "src/osd/windows/winfile.h", MAME_DIR .. "src/osd/windows/winclip.cpp", - MAME_DIR .. "src/osd/windows/winsocket.cpp", - MAME_DIR .. "src/osd/windows/winptty.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", } -- cgit v1.2.3