From ead39083d10f47bac43df631c58a8cb387399e86 Mon Sep 17 00:00:00 2001 From: Mathew Velasquez Date: Mon, 7 Sep 2015 13:03:21 -0400 Subject: [PATCH] fixed OS X build --- mkxp.pro | 15 ++++++++++++--- src/eventthread.cpp | 1 - src/oneshot.cpp | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mkxp.pro b/mkxp.pro index e4e38c4..ae4d614 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -43,9 +43,18 @@ contains(BINDING, NULL) { unix { CONFIG += link_pkgconfig - PKGCONFIG += sigc++-2.0 pixman-1 zlib physfs vorbisfile \ - sdl2 SDL2_image SDL2_ttf SDL_sound openal - LIBS += -ldl + PKGCONFIG += sigc++-2.0 pixman-1 zlib vorbisfile \ + sdl2 SDL2_image SDL2_ttf SDL_sound + 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 { PKGCONFIG += fluidsynth diff --git a/src/eventthread.cpp b/src/eventthread.cpp index ddf3a54..34d9475 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -31,7 +31,6 @@ #include #include -#include #include "sharedstate.h" #include "graphics.h" diff --git a/src/oneshot.cpp b/src/oneshot.cpp index ca8b116..703e30f 100644 --- a/src/oneshot.cpp +++ b/src/oneshot.cpp @@ -20,6 +20,7 @@ #include #elif defined __APPLE__ #define OS_OSX + #include #elif defined __linux__ #define OS_LINUX #include