mirror of
https://github.com/holub/mame
synced 2025-10-04 16:34:53 +03:00
more OSX 10.10 fixes and fixed mistake with x64 (nw)
This commit is contained in:
parent
816518fd49
commit
2816588761
2
makefile
2
makefile
@ -367,7 +367,7 @@ endif
|
|||||||
|
|
||||||
ifeq ($(TARGETOS),macosx)
|
ifeq ($(TARGETOS),macosx)
|
||||||
ifneq (,$(findstring 3.,$(CLANG_VERSION)))
|
ifneq (,$(findstring 3.,$(CLANG_VERSION)))
|
||||||
ifeq ($(ARCHITECTURE),x64)
|
ifeq ($(ARCHITECTURE),_x64)
|
||||||
ARCHITECTURE=_x64_clang
|
ARCHITECTURE=_x64_clang
|
||||||
else
|
else
|
||||||
ARCHITECTURE=_x86_clang
|
ARCHITECTURE=_x86_clang
|
||||||
|
@ -702,16 +702,19 @@ configuration { "linux-*" }
|
|||||||
|
|
||||||
configuration { "osx*" }
|
configuration { "osx*" }
|
||||||
links {
|
links {
|
||||||
|
"SDL2.framework",
|
||||||
"Cocoa.framework",
|
"Cocoa.framework",
|
||||||
"OpenGL.framework",
|
"OpenGL.framework",
|
||||||
"CoreAudio.framework",
|
"CoreAudio.framework",
|
||||||
"CoreMIDI.framework",
|
"CoreMIDI.framework",
|
||||||
"SDL2.framework",
|
|
||||||
"pthread",
|
"pthread",
|
||||||
}
|
}
|
||||||
buildoptions {
|
buildoptions {
|
||||||
"-F/Library/Frameworks/",
|
"-F/Library/Frameworks/",
|
||||||
}
|
}
|
||||||
|
linkoptions {
|
||||||
|
"-F/Library/Frameworks/",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
configuration { "mingw*" }
|
configuration { "mingw*" }
|
||||||
|
Loading…
Reference in New Issue
Block a user