Skip to content

Commit 12985c8

Browse files
authored
Compilation fixes (#267)
* Fix q3 plugin compilation on aarch64 macOS. * Fix duplicate symbol when statically linking ezhud.
1 parent 72fe015 commit 12985c8

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

plugins/ezhud/ezquakeisms.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
#ifdef FTEENGINE
66
#define Plug_Init Plug_EZHud_Init
7-
#else
7+
#endif
8+
89
plug2dfuncs_t *drawfuncs;
910
plugclientfuncs_t *clientfuncs;
1011
plugfsfuncs_t *filefuncs;
1112
pluginputfuncs_t *inputfuncs;
12-
#endif
1313

1414
struct ezcl_s cl;
1515
struct ezcls_s cls;

plugins/ezhud/ezquakeisms.h

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
#include <assert.h>
99
#include <ctype.h>
1010

11+
#ifdef FTEENGINE
12+
#define drawfuncs ezhud_drawfuncs
13+
#define filefuncs ezhud_filefuncs
14+
#define clientfuncs ezhud_clientfuncs
15+
#define inputfuncs ezhud_inputfuncs
16+
#endif
17+
1118
extern plug2dfuncs_t *drawfuncs;
1219
extern plugfsfuncs_t *filefuncs;
1320
extern plugclientfuncs_t *clientfuncs;

plugins/quake3/botlib/q_platform.h

+3
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
155155
#define idx64 1
156156
#define ARCH_STRING "x86_64"
157157
#define Q3_LITTLE_ENDIAN
158+
#elif defined __aarch64__
159+
#define ARCH_STRING "aarch64"
160+
#define Q3_LITTLE_ENDIAN
158161
#endif
159162

160163
#define DLL_EXT ".dylib"

0 commit comments

Comments
 (0)