summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/bus.lua13
-rw-r--r--scripts/src/cpu.lua2
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/osd/modules.lua2
-rw-r--r--scripts/src/osd/windows.lua32
-rw-r--r--scripts/target/mame/mess.lua4
-rw-r--r--scripts/toolchain.lua114
7 files changed, 82 insertions, 87 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index eebdd5d8a1d..5b6cd19f659 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -576,6 +576,19 @@ end
---------------------------------------------------
--
+--@src/devices/bus/electron/exp.h,BUSES["ELECTRON"] = true
+---------------------------------------------------
+
+if (BUSES["ELECTRON"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/electron/exp.cpp",
+ MAME_DIR .. "src/devices/bus/electron/exp.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/ep64/exp.h,BUSES["EP64"] = true
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 054a2bbabee..b06797009ea 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1449,7 +1449,7 @@ end
--------------------------------------------------
-- PATINHO FEIO - Escola Politecnica - USP (Brazil)
---@src/devices/cpu/patinhofeio/patinho_feio.h,CPUS["PATINHOFEIO"] = true
+--@src/devices/cpu/patinhofeio/patinhofeio_cpu.h,CPUS["PATINHOFEIO"] = true
--------------------------------------------------
if (CPUS["PATINHOFEIO"]~=null) then
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 080aa707153..77f6f4344dd 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -145,6 +145,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/adam_cas.h",
MAME_DIR .. "src/lib/formats/adam_dsk.cpp",
MAME_DIR .. "src/lib/formats/adam_dsk.h",
+ MAME_DIR .. "src/lib/formats/afs_dsk.cpp",
+ MAME_DIR .. "src/lib/formats/afs_dsk.h",
MAME_DIR .. "src/lib/formats/ami_dsk.cpp",
MAME_DIR .. "src/lib/formats/ami_dsk.h",
MAME_DIR .. "src/lib/formats/ap2_dsk.cpp",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a05e55ee4c6..5fb1d23c1bc 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -96,6 +96,8 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/output/none.cpp",
MAME_DIR .. "src/osd/modules/output/console.cpp",
MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.cpp",
+ MAME_DIR .. "src/osd/modules/output/win32_output.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index b4be2dc7ce4..8b48b8f0771 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -259,3 +259,35 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
+
+
+
+--------------------------------------------------
+-- ledutil
+--------------------------------------------------
+
+if _OPTIONS["with-tools"] then
+ project("ledutil")
+ uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ links {
+ "ocore_" .. _OPTIONS["osd"],
+ }
+
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+
+ files {
+ MAME_DIR .. "src/osd/windows/ledutil.cpp",
+ }
+end
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 116c3aea45a..1338d4038e7 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -618,6 +618,7 @@ BUSES["CRVISION"] = true
BUSES["DMV"] = true
BUSES["ECBBUS"] = true
BUSES["ECONET"] = true
+BUSES["ELECTRON"] = true
BUSES["EP64"] = true
BUSES["EPSON_SIO"] = true
BUSES["GAMEBOY"] = true
@@ -1067,7 +1068,7 @@ files {
MAME_DIR .. "src/mame/machine/xbox.cpp",
MAME_DIR .. "src/mame/includes/saturn.h",
MAME_DIR .. "src/mame/drivers/saturn.cpp",
- MAME_DIR .. "src/mame/machine/saturn.cpp",
+ MAME_DIR .. "src/mame/machine/saturn.cpp",
}
end
--------------------------------------------------
@@ -2611,6 +2612,7 @@ files {
MAME_DIR .. "src/mame/drivers/sun1.cpp",
MAME_DIR .. "src/mame/drivers/sun2.cpp",
MAME_DIR .. "src/mame/drivers/sun3.cpp",
+ MAME_DIR .. "src/mame/drivers/sun3x.cpp",
MAME_DIR .. "src/mame/drivers/sun4.cpp",
}
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index d94b8abddec..8536845c266 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -95,6 +95,8 @@ function toolchain(_buildDir, _subDir)
local androidPlatform = "android-14"
if _OPTIONS["with-android"] then
androidPlatform = "android-" .. _OPTIONS["with-android"]
+ elseif _OPTIONS["PLATFORM"]:find("64", -2) then
+ androidPlatform = "android-21"
end
local iosPlatform = ""
@@ -115,73 +117,40 @@ function toolchain(_buildDir, _subDir)
end
if string.find(_OPTIONS["gcc"], "android") then
- if not os.getenv("ANDROID_NDK_LLVM") then
- print("Set ANDROID_NDK_LLVM envrionment variables.")
+ -- 64-bit android platform requires >= 21
+ if _OPTIONS["PLATFORM"]:find("64", -2) and tonumber(androidPlatform:sub(9)) < 21 then
+ error("64-bit android requires platform 21 or higher")
end
-
- premake.gcc.cc = "$(ANDROID_NDK_LLVM)/bin/clang"
- premake.gcc.cxx = "$(ANDROID_NDK_LLVM)/bin/clang++"
- premake.gcc.llvm = true
- end
-
- if "android-arm" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_ARM") then
- print("Set ANDROID_NDK_ARM envrionment variables.")
+ if not os.getenv("ANDROID_NDK_ROOT") then
+ print("Set ANDROID_NDK_ROOT environment variable.")
end
-
- premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar"
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm")
- end
-
- if "android-arm64" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_ARM64") then
- print("Set ANDROID_NDK_ARM64 envrionment variables.")
+ if not os.getenv("ANDROID_NDK_LLVM") then
+ print("Set ANDROID_NDK_LLVM envrionment variable.")
end
-
- premake.gcc.ar = "$(ANDROID_NDK_ARM64)/bin/aarch64-linux-android-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm64")
- end
-
- if "android-mips" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_MIPS") then
- print("Set ANDROID_NDK_MIPS envrionment variables.")
+ platform_ndk_env = "ANDROID_NDK_" .. _OPTIONS["PLATFORM"]:upper()
+ if not os.getenv(platform_ndk_env) then
+ print("Set " .. platform_ndk_env .. " environment variable.")
end
- premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips")
- end
+ local platformToolchainMap = {
+ ['arm'] = "arm-linux-androideabi",
+ ['arm64'] = "aarch64-linux-android",
+ ['mips64'] = "mips64el-linux-android",
+ ['mips'] = "mipsel-linux-android",
+ ['x86'] = "i686-linux-android",
+ ['x64'] = "x86_64-linux-android",
+ }
- if "android-mips64" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_MIPS64") then
- print("Set ANDROID_NDK_MIPS64 envrionment variables.")
- end
+ toolchainPrefix = os.getenv(platform_ndk_env) .. "/bin/" .. platformToolchainMap[_OPTIONS["PLATFORM"]] .. "-"
- premake.gcc.ar = "$(ANDROID_NDK_MIPS64)/bin/mips64el-linux-android-ar"
+ premake.gcc.cc = "$(ANDROID_NDK_LLVM)/bin/clang"
+ premake.gcc.cxx = "$(ANDROID_NDK_LLVM)/bin/clang++"
+ premake.gcc.ar = toolchainPrefix .. "ar"
premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips64")
- end
-
- if "android-x86" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_X86") then
- print("Set ANDROID_NDK_X86 envrionment variables.")
- end
- premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86")
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-" .. _OPTIONS["PLATFORM"])
end
- if "android-x64" == _OPTIONS["gcc"] then
- if not os.getenv("ANDROID_NDK_X64") then
- print("Set ANDROID_NDK_X64 envrionment variables.")
- end
-
- premake.gcc.ar = "$(ANDROID_NDK_X64)/bin/x86_64-linux-android-ar"
- premake.gcc.llvm = true
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x64")
- end
if "asmjs" == _OPTIONS["gcc"] then
if not os.getenv("EMSCRIPTEN") then
@@ -804,6 +773,8 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug")
configuration { "android-*" }
+ targetdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/bin")
+ objdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/obj")
includedirs {
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include",
@@ -848,8 +819,6 @@ function toolchain(_buildDir, _subDir)
configuration { "android-arm" }
- targetdir (_buildDir .. "android-arm" .. "/bin")
- objdir (_buildDir .. "android-arm" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib",
@@ -876,9 +845,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-arm64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-arm64" .. "/bin")
- objdir (_buildDir .. "android-arm64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/arm64-v8a",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64",
@@ -899,8 +865,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-mips" }
- targetdir (_buildDir .. "android-mips" .. "/bin")
- objdir (_buildDir .. "android-mips" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/",
@@ -921,9 +885,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-mips64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-mips64" .. "/bin")
- objdir (_buildDir .. "android-mips64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/",
@@ -944,8 +905,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-x86" }
- targetdir (_buildDir .. "android-x86" .. "/bin")
- objdir (_buildDir .. "android-x86" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib",
@@ -968,9 +927,6 @@ function toolchain(_buildDir, _subDir)
}
configuration { "android-x64" }
- androidPlatform = "android-21" -- supported from API 21
- targetdir (_buildDir .. "android-x64" .. "/bin")
- objdir (_buildDir .. "android-x64" .. "/obj")
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86_64",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64",
@@ -1092,22 +1048,10 @@ function strip()
"$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix) .. "strip \"$(TARGET)\"",
}
- configuration { "android-arm", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-strip -s \"$(TARGET)\""
- }
-
- configuration { "android-mips", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-strip -s \"$(TARGET)\""
- }
-
- configuration { "android-x86", "Release" }
+ configuration { "android-*", "Release" }
postbuildcommands {
"$(SILENT) echo Stripping symbols.",
- "$(SILENT) $(ANDROID_NDK_X86)/bin/i686-linux-android-strip -s \"$(TARGET)\""
+ "$(SILENT) " .. toolchainPrefix .. "strip -s \"$(TARGET)\""
}
configuration { "linux-* or rpi", "Release" }