Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #332 from balr0g/osx-xcode-7

Browse Source 
Fix build with Xcode 7
This commit is contained in:
R. Belmont 2015-09-19 09:37:24 -04:00
commit baeed117b3
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -718,21 +718,19 @@ CHECK_CLANG :=
else
GCC_VERSION := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null)
ifneq ($(OS),solaris)
CLANG_VERSION := $(shell clang --version 2> /dev/null | head -n 1 | grep '[0-9]\.[0-9]' -o | tail -n 1)
CLANG_VERSION := $(shell clang --version 2> /dev/null | head -n 1 | grep -e 'version [0-9]\.[0-9]\(\.[0-9]\)\?' -o | grep -e '[0-9]\.[0-9]\(\.[0-9]\)\?' -o | tail -n 1)
endif
PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
CHECK_CLANG := $(shell gcc --version 2> /dev/null | grep 'clang' | head -n 1)
endif
ifeq ($(TARGETOS),macosx)
ifneq (,$(findstring 3.,$(CLANG_VERSION)))
ifeq ($(ARCHITECTURE),_x64)
ARCHITECTURE := _x64_clang
else
ARCHITECTURE := _x86_clang
endif
endif
endif
ifneq ($(PYTHON_AVAILABLE),python)
$(error Python is not available in path)

5
scripts/genie.lua
View File

@ -1000,6 +1000,11 @@ end
"-Wno-extern-c-compat",
}
end
if (version >= 70000) then
buildoptions {
"-Wno-tautological-undefined-compare",
}
end
else
if (version == 40201) then
buildoptions {

2
src/osd/modules/debugger/osx/debugview.m
View File

@ -404,7 +404,7 @@ static void debugwin_view_update(debug_view &view, void *osdprivate)
[text addAttribute:NSFontAttributeName value:font range:run];
NSPasteboard *const board = [NSPasteboard generalPasteboard];
[board declareTypes:[NSArray arrayWithObject:NSRTFPboardType] owner:nil];
[board setData:[text RTFFromRange:run documentAttributes:nil] forType:NSRTFPboardType];
[board setData:[text RTFFromRange:run documentAttributes:@{}] forType:NSRTFPboardType];
[text deleteCharactersInRange:run];
}

4
src/osd/modules/debugger/osx/pointsviewer.m
View File

@ -74,7 +74,7 @@
[breakScroll setBorderType:NSNoBorder];
[breakScroll setDocumentView:breakView];
[breakView release];
breakTab = [[NSTabViewItem alloc] initWithIdentifier:nil];
breakTab = [[NSTabViewItem alloc] initWithIdentifier:@""];
[breakTab setView:breakScroll];
[breakScroll release];
@ -89,7 +89,7 @@
[watchScroll setBorderType:NSNoBorder];
[watchScroll setDocumentView:watchView];
[watchView release];
watchTab = [[NSTabViewItem alloc] initWithIdentifier:nil];
watchTab = [[NSTabViewItem alloc] initWithIdentifier:@""];
[watchTab setView:watchScroll];
[watchScroll release];