summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua29
-rw-r--r--scripts/src/cpu.lua27
-rw-r--r--scripts/src/devices.lua4
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/lib.lua7
-rw-r--r--scripts/src/main.lua6
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--scripts/src/osd/sdl.lua2
-rw-r--r--scripts/src/video.lua12
10 files changed, 75 insertions, 20 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 89ff4990b7e..761257dc930 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -58,6 +58,16 @@ project "zlib"
uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9"
kind "StaticLib"
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ configuration { "gmake" }
+ if (version >= 30700) then
+ buildoptions {
+ "-Wno-shift-negative-value",
+ }
+ end
+ end
+
configuration { "vs*" }
buildoptions {
"/wd4131", -- warning C4131: 'xxx' : uses old-style declarator
@@ -119,11 +129,19 @@ project "softfloat"
includedirs {
MAME_DIR .. "src/osd",
}
+ configuration { "vs*" }
+ buildoptions {
+ "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+ "/wd4146", -- warning C4146: unary minus operator applied to unsigned type, result still unsigned
+ "/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
+ }
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
+ configuration { }
+
files {
MAME_DIR .. "3rdparty/softfloat/softfloat.c",
MAME_DIR .. "3rdparty/softfloat/fsincos.c",
@@ -356,6 +374,10 @@ project "lua"
-- "ForceCPP",
--}
+ configuration { "gmake" }
+ buildoptions_c {
+ "-Wno-bad-function-cast"
+ }
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@@ -371,7 +393,7 @@ end
defines {
"LUA_COMPAT_ALL",
}
- if not (_OPTIONS["targetos"]=="windows") then
+ if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
defines {
"LUA_USE_POSIX",
}
@@ -674,9 +696,6 @@ end
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/mingw",
}
- defines {
- "nullptr=NULL" -- not used but needed for C++11 code
- }
configuration { "osx*" }
includedirs {
@@ -743,7 +762,7 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp",
- --MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
}
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 1642b6d23b7..0c2882df5e5 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1436,6 +1436,22 @@ if (CPUS["PDP1"]~=null or _OPTIONS["with-tools"]) then
end
--------------------------------------------------
+-- PATINHO FEIO - Escola Politecnica - USP (Brazil)
+--@src/devices/cpu/patinhofeio/patinho_feio.h,CPUS["PATINHOFEIO"] = true
+--------------------------------------------------
+
+if (CPUS["PATINHOFEIO"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
+ }
+end
+
+if (CPUS["PATINHOFEIO"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp")
+end
+
+--------------------------------------------------
-- Motorola PowerPC series
--@src/devices/cpu/powerpc/ppc.h,CPUS["POWERPC"] = true
--------------------------------------------------
@@ -1447,17 +1463,7 @@ if (CPUS["POWERPC"]~=null) then
MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.cpp",
MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.h",
MAME_DIR .. "src/devices/cpu/powerpc/ppcdrc.cpp",
-
- --MAME_DIR .. "src/devices/cpu/powerpc/drc_ops.cpp",
- MAME_DIR .. "src/devices/cpu/powerpc/drc_ops.h",
- --MAME_DIR .. "src/devices/cpu/powerpc/ppc.cpp",
MAME_DIR .. "src/devices/cpu/powerpc/ppc.h",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc403.inc",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc602.inc",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc603.inc",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc_mem.inc",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc_ops.h",
- MAME_DIR .. "src/devices/cpu/powerpc/ppc_ops.inc",
}
end
@@ -1895,7 +1901,6 @@ if (CPUS["TMS9900"]~=null) then
MAME_DIR .. "src/devices/cpu/tms9900/tms9995.h",
MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.cpp",
MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.h",
- MAME_DIR .. "src/devices/cpu/tms9900/99xxcore.h",
MAME_DIR .. "src/devices/cpu/tms9900/tms99com.h",
}
end
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 70774a74ebc..05e8810f2df 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -23,6 +23,8 @@ function devicesProject(_target, _subtarget)
"ArchiveSplit",
}
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -59,6 +61,7 @@ if (_OPTIONS["SOURCES"] == nil) then
uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
kind (LIBTYPE)
targetsubdir(_target .."_" .. _subtarget)
+ addprojectflags()
options {
"ArchiveSplit",
}
@@ -96,6 +99,7 @@ if #disasm_files > 0 then
uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")
kind (LIBTYPE)
targetsubdir(_target .."_" .. _subtarget)
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index d377a6ebacf..7b19e397c93 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -14,6 +14,8 @@ targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
uuid ("e6fa15e4-a354-4526-acef-13c8e80fcacf")
kind (LIBTYPE)
+addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 2aa11eb0fd2..833504a92f7 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -13,6 +13,8 @@ project "utils"
uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a"
kind (LIBTYPE)
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -84,7 +86,6 @@ project "utils"
MAME_DIR .. "src/lib/util/pool.h",
MAME_DIR .. "src/lib/util/sha1.cpp",
MAME_DIR .. "src/lib/util/sha1.h",
- MAME_DIR .. "src/lib/util/tagmap.cpp",
MAME_DIR .. "src/lib/util/tagmap.h",
MAME_DIR .. "src/lib/util/unicode.cpp",
MAME_DIR .. "src/lib/util/unicode.h",
@@ -105,6 +106,8 @@ project "formats"
uuid "f69636b1-fcce-45ce-b09a-113e371a2d7a"
kind (LIBTYPE)
+ addprojectflags()
+
options {
"ArchiveSplit",
}
@@ -261,6 +264,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/fmsx_cas.h",
MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp",
MAME_DIR .. "src/lib/formats/fmtowns_dsk.h",
+ MAME_DIR .. "src/lib/formats/fsd_dsk.cpp",
+ MAME_DIR .. "src/lib/formats/fsd_dsk.h",
MAME_DIR .. "src/lib/formats/g64_dsk.cpp",
MAME_DIR .. "src/lib/formats/g64_dsk.h",
MAME_DIR .. "src/lib/formats/gtp_cas.cpp",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 7f24d684a2a..619833ccf57 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -26,6 +26,7 @@ end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
+ addprojectflags()
flags {
"NoManifest",
"Symbols", -- always include minimum symbols for executables
@@ -85,6 +86,11 @@ end
configuration { "asmjs" }
targetextension ".bc"
+ if os.getenv("EMSCRIPTEN") then
+ postbuildcommands {
+ os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\" $(TARGET) -o " .. MAME_DIR .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --post-js " .. MAME_DIR .. "src/osd/sdl/emscripten_post.js",
+ }
+ end
configuration { }
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 4b6b87c0eae..7b2dff521a5 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -13,6 +13,8 @@ project "netlist"
uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9"
kind (LIBTYPE)
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/lib/netlist",
MAME_DIR .. "src/osd",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 1abed7d1e25..cdb376c9c92 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -356,7 +356,7 @@ newoption {
}
if not _OPTIONS["NO_USE_MIDI"] then
- if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -379,7 +379,7 @@ newoption {
if not _OPTIONS["USE_QTDEBUG"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 4cb31f38083..30c776490c5 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -475,7 +475,7 @@ if _OPTIONS["with-tools"] then
flags {
"Symbols", -- always include minimum symbols for executables
}
-
+
dofile("sdl_cfg.lua")
includedirs {
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index be8d113bb69..ad91ca0f9f8 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -155,6 +155,18 @@ if (VIDEOS["EF9345"]~=null) then
end
--------------------------------------------------
+--
+--@src/devices/video/ef9365.h,VIDEOS["EF9365"] = true
+--------------------------------------------------
+
+if (VIDEOS["EF9365"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/ef9365.cpp",
+ MAME_DIR .. "src/devices/video/ef9365.h",
+ }
+end
+
+--------------------------------------------------
--@src/devices/video/epic12.h,VIDEOS["EPIC12"] = true
--------------------------------------------------