Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ ifeq ($(COMPILE_ARCH),axp)
COMPILE_ARCH=alpha
endif

ifeq ($(COMPILE_ARCH),arm)
COMPILE_ARCH=aarch64
endif
ifeq ($(COMPILE_ARCH),arm64)
COMPILE_ARCH=aarch64
endif

ifndef ARCH
ARCH=$(COMPILE_ARCH)
endif
Expand Down Expand Up @@ -458,7 +465,9 @@ else # ifeq Linux
#############################################################################

ifeq ($(PLATFORM),darwin)
HAVE_VM_COMPILED=true
ifneq ($(findstring $(ARCH),x86 x86_64 ppc ppc64),)
HAVE_VM_COMPILED=true
endif
LIBS = -framework Cocoa
CLIENT_LIBS=
RENDERER_LIBS=
Expand All @@ -482,6 +491,9 @@ ifeq ($(PLATFORM),darwin)
ifeq ($(ARCH),x86_64)
OPTIMIZEVM += -arch x86_64 -mfpmath=sse
endif
ifeq ($(ARCH),aarch64)
OPTIMIZEVM += -arch arm64
endif

# When compiling on OSX for OSX, we're not cross compiling as far as the
# Makefile is concerned, as target architecture is specified as a compiler
Expand Down
2 changes: 1 addition & 1 deletion code/qcommon/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ void Com_Init( char *commandLine ) {
Sys_Init();

if( Sys_WritePIDFile( ) ) {
#ifndef DEDICATED
#if !defined(DEDICATED) && !defined(MACOS_X)
const char *message = "The last time " CLIENT_WINDOW_TITLE " ran, "
"it didn't exit properly. This may be due to inappropriate video "
"settings. Would you like to start with \"safe\" video settings?";
Expand Down
6 changes: 6 additions & 0 deletions code/qcommon/q_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,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 "aarch64"
#define Q3_LITTLE_ENDIAN
#elif defined __arm__
#define ARCH_STRING "arm"
#define Q3_LITTLE_ENDIAN
#endif

#define DLL_EXT ".dylib"
Expand Down