From d68caa10496f8bd19f0d3c8739e92ad3d37c45d5 Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Sun, 30 Aug 2015 23:30:51 +0000 Subject: [PATCH] The MacPorts include paths are like UNIX not like APPLE git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6098 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: d5783118f74b3ab825a45337c224976265787f0a Former-commit-id: 408c02633167f61408f16afbfc9a42ad3ad3eb49 --- src/libs/tgfclient/tgfclient.h | 2 +- src/modules/networking/network.h | 2 +- src/modules/sound/snddefault/OpenalSound.h | 2 +- src/modules/sound/snddefault/OpenalSoundInterface.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/tgfclient/tgfclient.h b/src/libs/tgfclient/tgfclient.h index e7e760fd6..402a962bd 100644 --- a/src/libs/tgfclient/tgfclient.h +++ b/src/libs/tgfclient/tgfclient.h @@ -37,7 +37,7 @@ # pragma warning (disable:4251) // class XXX needs a DLL interface ... #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(USE_MACPORTS) # include #else # include diff --git a/src/modules/networking/network.h b/src/modules/networking/network.h index 01e334afa..ac9cac397 100644 --- a/src/modules/networking/network.h +++ b/src/modules/networking/network.h @@ -40,7 +40,7 @@ version : $Id$ #include #include -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(USE_MACPORTS) #include #else #include diff --git a/src/modules/sound/snddefault/OpenalSound.h b/src/modules/sound/snddefault/OpenalSound.h index 7c3aecf8b..570cfd9e6 100644 --- a/src/modules/sound/snddefault/OpenalSound.h +++ b/src/modules/sound/snddefault/OpenalSound.h @@ -19,7 +19,7 @@ #ifndef OPENAL_SOUND_H #define OPENAL_SOUND_H -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(USE_MACPORTS) #include"al.h" #include"alc.h" #else diff --git a/src/modules/sound/snddefault/OpenalSoundInterface.h b/src/modules/sound/snddefault/OpenalSoundInterface.h index 57204d23c..3c70392ed 100644 --- a/src/modules/sound/snddefault/OpenalSoundInterface.h +++ b/src/modules/sound/snddefault/OpenalSoundInterface.h @@ -19,7 +19,7 @@ #ifndef OPENAL_SOUND_INTERFACE_H #define OPENAL_SOUND_INTERFACE_H -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(USE_MACPORTS) #include"al.h" #include"alc.h" #else