nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-25 13:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compilation fixes (#267)

Browse source 
* Fix q3 plugin compilation on aarch64 macOS.

* Fix duplicate symbol when statically linking ezhud.
This commit is contained in:
Daniel Svensson 2024-08-30 21:05:06 +02:00 committed by GitHub
parent 72fe01555a
commit 12985c8b31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/ezhud/ezquakeisms.c
View file

@ -4,12 +4,12 @@
#ifdef FTEENGINE #ifdef FTEENGINE
#define Plug_Init Plug_EZHud_Init #define Plug_Init Plug_EZHud_Init
#else #endif
plug2dfuncs_t *drawfuncs; plug2dfuncs_t *drawfuncs;
plugclientfuncs_t *clientfuncs; plugclientfuncs_t *clientfuncs;
plugfsfuncs_t *filefuncs; plugfsfuncs_t *filefuncs;
pluginputfuncs_t *inputfuncs; pluginputfuncs_t *inputfuncs;
#endif
struct ezcl_s cl; struct ezcl_s cl;
struct ezcls_s cls; struct ezcls_s cls;

7
plugins/ezhud/ezquakeisms.h
View file

@ -8,6 +8,13 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#ifdef FTEENGINE
#define drawfuncs ezhud_drawfuncs
#define filefuncs ezhud_filefuncs
#define clientfuncs ezhud_clientfuncs
#define inputfuncs ezhud_inputfuncs
#endif
extern plug2dfuncs_t *drawfuncs; extern plug2dfuncs_t *drawfuncs;
extern plugfsfuncs_t *filefuncs; extern plugfsfuncs_t *filefuncs;
extern plugclientfuncs_t *clientfuncs; extern plugclientfuncs_t *clientfuncs;

3
plugins/quake3/botlib/q_platform.h
View file

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