okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Makefile for OSX

Browse source 
Bump base SDK from 10.5 -> 10.7
Just use the builtin __APPLE__
This commit is contained in:
Victor Roemer 2016-06-12 17:06:54 -04:00
parent a40588c8b9
commit 398dea397c
22 changed files with 39 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/client/cl_curl.h
View file

@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifdef WIN32
#define DEFAULT_CURL_LIB "libcurl-4.dll"
#define ALTERNATE_CURL_LIB "libcurl-3.dll"
#elif defined(MACOS_X)
#elif defined(__APPLE__)
#define DEFAULT_CURL_LIB "libcurl.dylib"
#else
#define DEFAULT_CURL_LIB "libcurl.so.4"

4
code/client/cl_main.c
View file

@ -3554,7 +3554,7 @@ void CL_Init( void ) {
#endif
cl_conXOffset = Cvar_Get ("cl_conXOffset", "0", 0);
#ifdef MACOS_X
#ifdef __APPLE__
// In game video is REALLY slow in Mac OS X right now due to driver slowness
cl_inGameVideo = Cvar_Get ("r_inGameVideo", "0", CVAR_ARCHIVE);
#else
@ -3571,7 +3571,7 @@ void CL_Init( void ) {
m_yaw = Cvar_Get ("m_yaw", "0.022", CVAR_ARCHIVE);
m_forward = Cvar_Get ("m_forward", "0.25", CVAR_ARCHIVE);
m_side = Cvar_Get ("m_side", "0.25", CVAR_ARCHIVE);
#ifdef MACOS_X
#ifdef __APPLE__
// Input is jittery on OS X w/o this
m_filter = Cvar_Get ("m_filter", "1", CVAR_ARCHIVE);
#else

3
code/client/qal.h
View file

@ -37,8 +37,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../AL/al.h"
#include "../AL/alc.h"
#else
#ifdef _MSC_VER
#if defined(_MSC_VER) || defined(__APPLE__)
// MSVC users must install the OpenAL SDK which doesn't use the AL/*.h scheme.
// OSX framework also needs this
#include <al.h>
#include <alc.h>
#else

2
code/client/snd_mix.c
View file

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "client.h"
#include "snd_local.h"
#if idppc_altivec && !defined(MACOS_X)
#if idppc_altivec && !defined(__APPLE__)
#include <altivec.h>
#endif

6
code/client/snd_openal.c
View file

@ -582,7 +582,7 @@ typedef struct src_s
qboolean local; // Is this local (relative to the cam)
} src_t;
#ifdef MACOS_X
#ifdef __APPLE__
#define MAX_SRC 64
#else
#define MAX_SRC 128
@ -2208,7 +2208,7 @@ static cvar_t *s_alCapture;
#ifdef _WIN32
#define ALDRIVER_DEFAULT "OpenAL32.dll"
#elif defined(MACOS_X)
#elif defined(__APPLE__)
#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
#elif defined(__OpenBSD__)
#define ALDRIVER_DEFAULT "libopenal.so"
@ -2642,7 +2642,7 @@ qboolean S_AL_Init( soundInterface_t *si )
#endif
else
{
#ifdef MACOS_X
#ifdef __APPLE__
// !!! FIXME: Apple has a 1.1-compliant OpenAL, which includes
// !!! FIXME: capture support, but they don't list it in the
// !!! FIXME: extension string. We need to check the version string,