Upgrades to Xcode project and Apple Silicon support

- Reorganized Xcode project
- Added missionpack support to Xcode project
- Incorporated changes from MaddTheSane for Apple Silicon support https://github.com/maddthesane/ioq3
- Built SDL 2.0.14 for Apple Siicon, added to existing SDL dylib
- Built SDLMain for Apple Silicon, added to existing libSDL2main.a
This commit is contained in:
Tom Kidd 2021-01-28 17:37:23 -06:00
parent b8be5a8bd7
commit 52a43ae1c4
42 changed files with 936 additions and 756 deletions

View file

@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "qasm-inline.h"
#if defined (__i386__) || defined(__x86_64__)
static const unsigned short fpucw = 0x0C7F;
/*
@ -97,3 +98,4 @@ int qvmftolx87(void)
return retval;
}
#endif

View file

@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "qasm-inline.h"
#include "../qcommon/q_shared.h"
#if defined (__i386__) || defined(__x86_64__)
/*
* GNU inline asm version of qsnapvector
* See MASM snapvector.asm for commentary
@ -71,3 +73,5 @@ void qsnapvectorx87(vec3_t vec)
: "memory"
);
}
#endif

Binary file not shown.

Binary file not shown.

View file

@ -29,6 +29,8 @@
#include "config.h"
#endif
#if defined (__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
#include <smmintrin.h>
@ -87,3 +89,4 @@ void celt_fir_sse4_1(const opus_val16 *x,
}
#endif
#endif

View file

@ -29,6 +29,7 @@
#include "config.h"
#endif
#if defined (__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
@ -93,3 +94,4 @@ opus_val32 celt_inner_prod_sse2(const opus_val16 *x, const opus_val16 *y,
return sum;
}
#endif
#endif

View file

@ -29,6 +29,8 @@
#include "config.h"
#endif
#if defined (__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
@ -193,3 +195,4 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32
_mm_storeu_si128((__m128i *)sum, initSum);
}
#endif
#endif

View file

@ -30,6 +30,8 @@
#include "config.h"
#endif
#if defined (__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
#include "celt_lpc.h"
@ -215,3 +217,4 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch)
}
#endif
#endif

View file

@ -29,6 +29,8 @@
#include "config.h"
#endif
#if defined (__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
#include <smmintrin.h>
@ -275,3 +277,4 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s
RESTORE_STACK;
return( ret );
}
#endif

View file

@ -156,6 +156,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define idx64 1
#define ARCH_STRING "x86_64"
#define Q3_LITTLE_ENDIAN
#elif defined __aarch64__
#define ARCH_STRING "arm64"
#define Q3_LITTLE_ENDIAN
#ifndef NO_VM_COMPILED
#define NO_VM_COMPILED
#endif
#endif
#define DLL_EXT ".dylib"

View file

@ -42,6 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif
#endif
#if defined (__i386__) || defined(__x86_64__)
static void VM_Destroy_Compiled(vm_t* self);
/*
@ -1807,3 +1808,4 @@ int VM_CallCompiled(vm_t *vm, int *args)
return opStack[opStackOfs];
}
#endif

View file

@ -50,9 +50,9 @@ dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *t
[alert setInformativeText: [NSString stringWithUTF8String: message]];
if( type == DT_ERROR )
[alert setAlertStyle: NSCriticalAlertStyle];
[alert setAlertStyle: NSAlertStyleCritical];
else
[alert setAlertStyle: NSWarningAlertStyle];
[alert setAlertStyle: NSAlertStyleWarning];
switch( type )
{