Skip to content

Commit e518634

Browse files
committed
Tied up loose ends:
* Updated copyright for FLAC. * Enabled some more warnings for LZMA now that upstream is cleaner. * Removed Subversion attributes from .gitattributes.
1 parent ba40b01 commit e518634

File tree

4 files changed

+18
-76
lines changed

4 files changed

+18
-76
lines changed

.gitattributes

+13-53
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,22 @@
11
* text=auto !eol
22

3-
*.bat eol=crlf svneol=CRLF#text/plain
4-
*.cmd eol=crlf svneol=CRLF#text/plain
5-
*.in svneol=native#text/plain
3+
*.bat eol=crlf
4+
*.cmd eol=crlf
65
*.jed binary
7-
*.lst svneol=native#text/plain
8-
*.mak svneol=native#text/plain
9-
*.man eol=crlf svneol=CRLF#text/plain
10-
*.ops svneol=native#text/plain
11-
*.po eol=lf svneol=LF#text/plain
12-
*.rc eol=crlf svneol=CRLF#text/plain
13-
*.sh eol=lf svneol=LF#text/plain
6+
*.man eol=crlf
7+
*.po eol=lf
8+
*.rc eol=crlf
9+
*.sh eol=lf
1410

15-
*.css svneol=native#text/css
16-
*.html svneol=native#text/html
17-
*.js svneol=native#text/javascript
18-
*.md svneol=native#text/plain
19-
*.txt svneol=native#text/plain
11+
*.gif -text
12+
*.ico -text
13+
*.jpg -text
14+
*.png -text
15+
*.ppm -text
2016

21-
*.c svneol=native#text/plain
22-
*.cpp svneol=native#text/plain
23-
*.h svneol=native#text/plain
24-
*.hpp svneol=native#text/plain
25-
*.hxx svneol=native#text/plain
26-
*.inc svneol=native#text/plain
27-
*.inl svneol=native#text/plain
28-
*.ipp svneol=native#text/plain
29-
*.lua svneol=native#text/plain
30-
*.m svneol=native#text/plain
31-
*.mm svneol=native#text/plain
32-
*.py svneol=native#text/plain
17+
*.bdf eol=crlf
3318

34-
*.dtd svneol=native#application/xml-dtd
35-
*.cfg svneol=native#text/xml
36-
*.hsi svneol=native#text/xml
37-
*.lay svneol=native#text/xml
38-
*.xml svneol=native#text/xml
39-
40-
*.gif -text svneol=unset#image/gif
41-
*.ico -text svneol=unset#image/x-icon
42-
*.jpg -text svneol=unset#image/jpeg
43-
*.png -text svneol=unset#image/png
44-
*.ppm -text svneol=unset#image/x-portable-pixmap
45-
46-
*.bdf eol=crlf svneol=CRLF#application/x-font-bdf
47-
48-
*.zip -text svneol=unset#application/zip
49-
50-
makefile svneol=native#text/plain
51-
Makefile svneol=native#text/plain
52-
readme svneol=native#text/plain
53-
README svneol=native#text/plain
54-
55-
hlsl/*.fx svneol=native#text/plain
56-
keymaps/*.map svneol=native#text/plain
57-
src/osd/sdl/man/* svneol=LF#text/plain eol=lf
58-
src/osd/sdl/shader/*.fsh svneol=native#text/plain
59-
src/osd/sdl/shader/*.vsh svneol=native#text/plain
19+
*.zip -text
6020

6121
3rdparty/flac/test/cuesheets/*.cue -text
6222
3rdparty/flac/test/flac-to-flac-metadata-test-files/*.meta -text

COPYING

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of
8989
the University of California
9090

9191
FLAC - Free Lossless Audio Codec
92-
Copyright (c) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
92+
Copyright (C) 2000-2009 Josh Coalson
93+
Copyright (C) 2011-2023 Xiph.Org Foundation
9394

9495
The msinttypes r29
9596
Copyright (c) 2006-2013 Alexander Chemeris

docs/source/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ MAME Documentation
3030
tools/index
3131

3232
contributing/index
33+
devtutorials/index
3334
techspecs/index
3435

3536
security

scripts/src/3rdparty.lua

+2-22
Original file line numberDiff line numberDiff line change
@@ -799,16 +799,11 @@ project "7z"
799799

800800
configuration { "gmake or ninja" }
801801
buildoptions_c {
802-
"-Wno-strict-prototypes",
803-
"-Wno-undef",
802+
"-Wno-error=undef",
804803
}
805804
if _OPTIONS["gcc"]~=nil then
806805
if string.find(_OPTIONS["gcc"], "clang") then
807-
if str_to_version(_OPTIONS["gcc_version"]) >= 100000 then
808-
buildoptions_c {
809-
"-Wno-error=misleading-indentation",
810-
}
811-
end
806+
812807
else
813808
if str_to_version(_OPTIONS["gcc_version"]) >= 130000 then
814809
buildoptions_c {
@@ -818,27 +813,12 @@ if _OPTIONS["gcc"]~=nil then
818813
end
819814
end
820815

821-
configuration { "android-*" }
822-
buildoptions {
823-
"-Wno-error=misleading-indentation",
824-
}
825-
826-
configuration { "asmjs" }
827-
buildoptions {
828-
"-Wno-error=misleading-indentation",
829-
}
830-
831816
configuration { "vs*" }
832817
buildoptions {
833818
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
834819
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
835820
"/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
836821
}
837-
if _OPTIONS["vs"]=="clangcl" then
838-
buildoptions {
839-
"-Wno-error=misleading-indentation",
840-
}
841-
end
842822
if _OPTIONS["vs"]=="intel-15" then
843823
buildoptions {
844824
"/Qwd869", -- remark #869: parameter "xxx" was never referenced

0 commit comments

Comments
 (0)