diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/src/3rdparty.lua | 3 | ||||
-rw-r--r-- | scripts/src/bus.lua | 2 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 8 | ||||
-rw-r--r-- | scripts/toolchain.lua | 60 |
5 files changed, 29 insertions, 48 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2ccfa749e19..431507005bc 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -203,6 +203,9 @@ buildoptions { } configuration { } +buildoptions { + "-Wno-error=maybe-uninitialized" +} defines { "SOFTFLOAT_ROUND_ODD", "INLINE_LEVEL=5", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index dc1092a27f1..26446e6c2c6 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -3055,6 +3055,8 @@ if (BUSES["ZORRO"]~=null) then MAME_DIR .. "src/devices/bus/amiga/zorro/cards.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.cpp", MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.h", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.cpp", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.cpp", MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp", diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index afb42dd1dd7..081269edf63 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -988,12 +988,16 @@ if (CPUS["MCS51"]~=null) then MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp", MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h", MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.hxx", + MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.cpp", + MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.h", } end if (CPUS["MCS51"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.h") end -------------------------------------------------- diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index c7a1e4cf60a..1c0d2e119ae 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1106,6 +1106,7 @@ function linkProjects_mame_mess(_target, _subtarget) "mos", "motorola", "multitch", + "mupid", "nakajima", "nascom", "ncd", @@ -2566,6 +2567,11 @@ files { MAME_DIR .. "src/mame/includes/mpf1.h", } +createMESSProjects(_target, _subtarget, "mupid") +files { + MAME_DIR .. "src/mame/drivers/mdisk.cpp", +} + createMESSProjects(_target, _subtarget, "nakajima") files { MAME_DIR .. "src/mame/drivers/nakajies.cpp", @@ -3055,6 +3061,7 @@ files { MAME_DIR .. "src/mame/includes/mz700.h", MAME_DIR .. "src/mame/drivers/pc1500.cpp", MAME_DIR .. "src/mame/drivers/pocketc.cpp", + MAME_DIR .. "src/mame/machine/pocketc.cpp", MAME_DIR .. "src/mame/includes/pocketc.h", MAME_DIR .. "src/mame/video/pc1401.cpp", MAME_DIR .. "src/mame/machine/pc1401.cpp", @@ -3812,6 +3819,7 @@ files { MAME_DIR .. "src/mame/drivers/mod8.cpp", MAME_DIR .. "src/mame/drivers/modellot.cpp", MAME_DIR .. "src/mame/drivers/molecular.cpp", + MAME_DIR .. "src/mame/drivers/monon_color.cpp", MAME_DIR .. "src/mame/drivers/ms0515.cpp", MAME_DIR .. "src/mame/drivers/ms9540.cpp", MAME_DIR .. "src/mame/drivers/mstation.cpp", diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index e1052dc4500..e596c06bfb0 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -94,11 +94,11 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION) - local androidPlatform = "android-21" + local androidPlatform = "android-24" if _OPTIONS["with-android"] then androidPlatform = "android-" .. _OPTIONS["with-android"] elseif _OPTIONS["PLATFORM"]:find("64", -2) then - androidPlatform = "android-21" + androidPlatform = "android-24" end local iosPlatform = "" @@ -847,6 +847,7 @@ function toolchain(_buildDir, _subDir) MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include", "$(ANDROID_NDK_ROOT)/sources/android/support/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } @@ -864,10 +865,12 @@ function toolchain(_buildDir, _subDir) "log", "c++_static", "c++abi", - "android_support", "stdc++", "gcc", } + buildoptions_c { + "-Wno-strict-prototypes", + } buildoptions { "-fpic", "-ffunction-sections", @@ -880,6 +883,8 @@ function toolchain(_buildDir, _subDir) "-Wno-cast-align", "-Wno-unknown-attributes", "-Wno-macro-redefined", + "-DASIO_HAS_STD_STRING_VIEW", + "-Wno-unused-function", } linkoptions { "-no-canonical-prefixes", @@ -893,11 +898,10 @@ function toolchain(_buildDir, _subDir) configuration { "android-arm" } libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a", - "$(ANDROID_NDK_ARM)/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/arm-linux-androideabi", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_ARM)", @@ -926,7 +930,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/aarch64-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_ARM64)", @@ -940,53 +944,13 @@ function toolchain(_buildDir, _subDir) "-target aarch64-none-linux-android", } - configuration { "android-mips" } - libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/", - } - includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/include", - } - buildoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS)", - "-target mipsel-none-linux-android", - } - linkoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS)", - "-target mipsel-none-linux-android", - "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o", - } - - configuration { "android-mips64" } - libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/", - } - includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/include", - } - buildoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS64)", - "-target mips64el-none-linux-android", - } - linkoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS64)", - "-target mips64el-none-linux-android", - "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtbegin_so.o", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtend_so.o", - } - configuration { "android-x86" } libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/i686-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_X86)", @@ -1008,7 +972,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/x86_64-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_X64)", |