From e5186344e50568d835722ced5303f3546ae3b3fb Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 6 Dec 2023 17:31:13 +1100 Subject: Tied up loose ends: * Updated copyright for FLAC. * Enabled some more warnings for LZMA now that upstream is cleaner. * Removed Subversion attributes from .gitattributes. --- .gitattributes | 66 ++++++++++-------------------------------------- COPYING | 3 ++- docs/source/index.rst | 1 + scripts/src/3rdparty.lua | 24 ++---------------- 4 files changed, 18 insertions(+), 76 deletions(-) diff --git a/.gitattributes b/.gitattributes index 06823409ff6..dd60149c998 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,62 +1,22 @@ * text=auto !eol -*.bat eol=crlf svneol=CRLF#text/plain -*.cmd eol=crlf svneol=CRLF#text/plain -*.in svneol=native#text/plain +*.bat eol=crlf +*.cmd eol=crlf *.jed binary -*.lst svneol=native#text/plain -*.mak svneol=native#text/plain -*.man eol=crlf svneol=CRLF#text/plain -*.ops svneol=native#text/plain -*.po eol=lf svneol=LF#text/plain -*.rc eol=crlf svneol=CRLF#text/plain -*.sh eol=lf svneol=LF#text/plain +*.man eol=crlf +*.po eol=lf +*.rc eol=crlf +*.sh eol=lf -*.css svneol=native#text/css -*.html svneol=native#text/html -*.js svneol=native#text/javascript -*.md svneol=native#text/plain -*.txt svneol=native#text/plain +*.gif -text +*.ico -text +*.jpg -text +*.png -text +*.ppm -text -*.c svneol=native#text/plain -*.cpp svneol=native#text/plain -*.h svneol=native#text/plain -*.hpp svneol=native#text/plain -*.hxx svneol=native#text/plain -*.inc svneol=native#text/plain -*.inl svneol=native#text/plain -*.ipp svneol=native#text/plain -*.lua svneol=native#text/plain -*.m svneol=native#text/plain -*.mm svneol=native#text/plain -*.py svneol=native#text/plain +*.bdf eol=crlf -*.dtd svneol=native#application/xml-dtd -*.cfg svneol=native#text/xml -*.hsi svneol=native#text/xml -*.lay svneol=native#text/xml -*.xml svneol=native#text/xml - -*.gif -text svneol=unset#image/gif -*.ico -text svneol=unset#image/x-icon -*.jpg -text svneol=unset#image/jpeg -*.png -text svneol=unset#image/png -*.ppm -text svneol=unset#image/x-portable-pixmap - -*.bdf eol=crlf svneol=CRLF#application/x-font-bdf - -*.zip -text svneol=unset#application/zip - -makefile svneol=native#text/plain -Makefile svneol=native#text/plain -readme svneol=native#text/plain -README svneol=native#text/plain - -hlsl/*.fx svneol=native#text/plain -keymaps/*.map svneol=native#text/plain -src/osd/sdl/man/* svneol=LF#text/plain eol=lf -src/osd/sdl/shader/*.fsh svneol=native#text/plain -src/osd/sdl/shader/*.vsh svneol=native#text/plain +*.zip -text 3rdparty/flac/test/cuesheets/*.cue -text 3rdparty/flac/test/flac-to-flac-metadata-test-files/*.meta -text diff --git a/COPYING b/COPYING index fcb38f4911b..8530a46c0c2 100644 --- a/COPYING +++ b/COPYING @@ -89,7 +89,8 @@ Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California FLAC - Free Lossless Audio Codec -Copyright (c) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson +Copyright (C) 2000-2009 Josh Coalson +Copyright (C) 2011-2023 Xiph.Org Foundation The msinttypes r29 Copyright (c) 2006-2013 Alexander Chemeris diff --git a/docs/source/index.rst b/docs/source/index.rst index e2e54a4ee2b..f7ed326465d 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -30,6 +30,7 @@ MAME Documentation tools/index contributing/index + devtutorials/index techspecs/index security diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 8de4c061105..b0ebea6d943 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -799,16 +799,11 @@ project "7z" configuration { "gmake or ninja" } buildoptions_c { - "-Wno-strict-prototypes", - "-Wno-undef", + "-Wno-error=undef", } if _OPTIONS["gcc"]~=nil then if string.find(_OPTIONS["gcc"], "clang") then - if str_to_version(_OPTIONS["gcc_version"]) >= 100000 then - buildoptions_c { - "-Wno-error=misleading-indentation", - } - end + else if str_to_version(_OPTIONS["gcc_version"]) >= 130000 then buildoptions_c { @@ -818,27 +813,12 @@ if _OPTIONS["gcc"]~=nil then end end - configuration { "android-*" } - buildoptions { - "-Wno-error=misleading-indentation", - } - - configuration { "asmjs" } - buildoptions { - "-Wno-error=misleading-indentation", - } - configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } -if _OPTIONS["vs"]=="clangcl" then - buildoptions { - "-Wno-error=misleading-indentation", - } -end if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd869", -- remark #869: parameter "xxx" was never referenced -- cgit v1.2.3