summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/src/osd
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2018-02-01 01:13:16 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2018-02-01 01:13:16 +1100
commit73ce78f7b4d4c1ff8ed36f6fef61fc00a2e9135e (patch)
tree7a50841459d42fee5739652092d6629870f81e3e /docs/release/scripts/src/osd
parent6488544820bbf9bc96bd2f29bbc0a8b7c0b246fa (diff)
0.193 Release filestag193
Diffstat (limited to 'docs/release/scripts/src/osd')
-rw-r--r--docs/release/scripts/src/osd/modules.lua2
-rw-r--r--docs/release/scripts/src/osd/newui.lua8
-rw-r--r--docs/release/scripts/src/osd/sdl.lua12
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua3
-rw-r--r--docs/release/scripts/src/osd/windows.lua5
-rw-r--r--docs/release/scripts/src/osd/windows_cfg.lua3
-rw-r--r--docs/release/scripts/src/osd/winui.lua6
-rw-r--r--docs/release/scripts/src/osd/winui_cfg.lua1
8 files changed, 16 insertions, 24 deletions
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua
index 79ecfed35a7..06392a6c34e 100644
--- a/docs/release/scripts/src/osd/modules.lua
+++ b/docs/release/scripts/src/osd/modules.lua
@@ -207,6 +207,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/view.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
}
includedirs {
@@ -410,7 +411,6 @@ function osdmodulestargetconf()
"-L$(shell qmake -query QT_INSTALL_LIBS)",
}
links {
- "qtmain",
"Qt5Core.dll",
"Qt5Gui.dll",
"Qt5Widgets.dll",
diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua
index a2e95a665da..3caa3a83d0d 100644
--- a/docs/release/scripts/src/osd/newui.lua
+++ b/docs/release/scripts/src/osd/newui.lua
@@ -16,9 +16,9 @@ premake.make.linkoptions_after = false;
function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
- configuration { "mingw*-gcc" }
- linkoptions {
- "-municode",
+ configuration { "mingw*" }
+ links {
+ "mingw32",
}
configuration { }
@@ -167,6 +167,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index 5970f6d3334..718ca6e551e 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/scripts/src/osd/sdl.lua
@@ -68,7 +68,8 @@ function maintargetosdoptions(_target,_subtarget)
if _OPTIONS["USE_LIBSDL"]~="1" then
configuration { "mingw*"}
links {
- "SDL2.dll",
+ "SDL2main",
+ "SDL2",
}
configuration { "vs*" }
links {
@@ -94,14 +95,6 @@ function maintargetosdoptions(_target,_subtarget)
links {
"psapi",
}
- configuration { "mingw*" }
- linkoptions{
- "-municode",
- }
- configuration { "vs*" }
- flags {
- "Unicode",
- }
configuration {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
@@ -418,7 +411,6 @@ project ("osd_" .. _OPTIONS["osd"])
files {
MAME_DIR .. "src/osd/sdl/osdsdl.h",
- MAME_DIR .. "src/osd/sdl/sdlinc.h",
MAME_DIR .. "src/osd/sdl/sdlprefix.h",
MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
MAME_DIR .. "src/osd/osdepend.h",
diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index 3f8e3e10bbc..7e74e43f911 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/scripts/src/osd/sdl_cfg.lua
@@ -86,7 +86,7 @@ if BASE_TARGETOS=="unix" then
"MACOSX_USE_LIBSDL",
}
buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"),
}
end
end
@@ -107,7 +107,6 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"UNICODE",
"_UNICODE",
- "main=utf8_main",
"_WIN32_WINNT=0x0501",
"WIN32_LEAN_AND_MEAN",
"NOMINMAX",
diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua
index 32e7f2339a7..00432b75a8e 100644
--- a/docs/release/scripts/src/osd/windows.lua
+++ b/docs/release/scripts/src/osd/windows.lua
@@ -16,9 +16,6 @@ function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
configuration { "mingw*" }
- linkoptions {
- "-municode",
- }
links {
"mingw32",
}
@@ -191,6 +188,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua
index 1baa45f4255..73598da6760 100644
--- a/docs/release/scripts/src/osd/windows_cfg.lua
+++ b/docs/release/scripts/src/osd/windows_cfg.lua
@@ -10,8 +10,7 @@ defines {
configuration { "mingw* or vs*" }
defines {
"UNICODE",
- "_UNICODE",
- "main=utf8_main",
+ "_UNICODE"
}
configuration { "vs*" }
diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua
index 8cfdd0408e2..fbb213634bf 100644
--- a/docs/release/scripts/src/osd/winui.lua
+++ b/docs/release/scripts/src/osd/winui.lua
@@ -191,6 +191,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
@@ -207,11 +209,11 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/winui/datamap.cpp",
MAME_DIR .. "src/osd/winui/dialogs.cpp",
MAME_DIR .. "src/osd/winui/dijoystick.cpp",
- MAME_DIR .. "src/osd/winui/directdraw.cpp",
+-- MAME_DIR .. "src/osd/winui/directdraw.cpp",
MAME_DIR .. "src/osd/winui/directinput.cpp",
MAME_DIR .. "src/osd/winui/directories.cpp",
MAME_DIR .. "src/osd/winui/dirwatch.cpp",
- MAME_DIR .. "src/osd/winui/dxdecode.cpp",
+-- MAME_DIR .. "src/osd/winui/dxdecode.cpp",
MAME_DIR .. "src/osd/winui/help.cpp",
MAME_DIR .. "src/osd/winui/helpids.cpp",
MAME_DIR .. "src/osd/winui/history.cpp",
diff --git a/docs/release/scripts/src/osd/winui_cfg.lua b/docs/release/scripts/src/osd/winui_cfg.lua
index 9c5cb9b3778..20c6034a2e1 100644
--- a/docs/release/scripts/src/osd/winui_cfg.lua
+++ b/docs/release/scripts/src/osd/winui_cfg.lua
@@ -4,7 +4,6 @@ defines {
"OSD_WINDOWS",
"USE_SDL=0",
--"WIN95_MULTIMON"
- "main=utf8_main",
"_WIN32_WINNT=0x0501",
"USE_QTDEBUG=0",
"WIN32_LEAN_AND_MEAN",