mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge pull request #8572 from zhykzhykzhyk/master
Fix Qt building on MacOS X 10.10 and later.
This commit is contained in:
commit
3f0f6423d9
2 files changed
+1
-5
No files matched your search
@@ -42,10 +42,6 @@ macx|equals(PLATFORM_NAME, "linux") {
|
||||
SOURCES += $$P/SDL/SDLJoystick.cpp
|
||||
HEADERS += $$P/SDL/SDLJoystick.h
|
||||
PKGCONFIG += sdl2
|
||||
macx {
|
||||
LIBS += -F/Library/Frameworks -framework SDL
|
||||
INCLUDEPATH += /Library/Frameworks/SDL.framework/Versions/A/Headers
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
QMAKE_MAC_SDK=macosx10.9
|
||||
QT_CONFIG -= no-pkg-config
|
||||
|
||||
!contains(CONFIG, staticlib) {
|
||||
# Executable
|
||||
|
||||
Reference in new issue
Block a user