fixed OS X build
This commit is contained in:
parent
186dc1bfe9
commit
ead39083d1
15
mkxp.pro
15
mkxp.pro
|
@ -43,9 +43,18 @@ contains(BINDING, NULL) {
|
||||||
|
|
||||||
unix {
|
unix {
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
PKGCONFIG += sigc++-2.0 pixman-1 zlib physfs vorbisfile \
|
PKGCONFIG += sigc++-2.0 pixman-1 zlib vorbisfile \
|
||||||
sdl2 SDL2_image SDL2_ttf SDL_sound openal
|
sdl2 SDL2_image SDL2_ttf SDL_sound
|
||||||
LIBS += -ldl
|
LIBS += -ldl -lphysfs
|
||||||
|
macx: {
|
||||||
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
|
||||||
|
CONFIG -= app_bundle
|
||||||
|
INCLUDEPATH += /System/Library/Frameworks/OpenAL.framework/Headers
|
||||||
|
LIBS += -framework OpenAL
|
||||||
|
}
|
||||||
|
!macx: {
|
||||||
|
PKGCONFIG += openal
|
||||||
|
}
|
||||||
|
|
||||||
SHARED_FLUID {
|
SHARED_FLUID {
|
||||||
PKGCONFIG += fluidsynth
|
PKGCONFIG += fluidsynth
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
|
|
||||||
#include <al.h>
|
#include <al.h>
|
||||||
#include <alc.h>
|
#include <alc.h>
|
||||||
#include <alext.h>
|
|
||||||
|
|
||||||
#include "sharedstate.h"
|
#include "sharedstate.h"
|
||||||
#include "graphics.h"
|
#include "graphics.h"
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include <SDL2/SDL_syswm.h>
|
#include <SDL2/SDL_syswm.h>
|
||||||
#elif defined __APPLE__
|
#elif defined __APPLE__
|
||||||
#define OS_OSX
|
#define OS_OSX
|
||||||
|
#include <pwd.h>
|
||||||
#elif defined __linux__
|
#elif defined __linux__
|
||||||
#define OS_LINUX
|
#define OS_LINUX
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
Loading…
Reference in New Issue