mirror of https://github.com/yquake2/ref_vk.git
Fixed build on arm macOS
This commit is contained in:
parent
c66e827e70
commit
8a50516b1e
17
Makefile
17
Makefile
|
@ -46,6 +46,10 @@ YQ2_ARCH ?= $(PROCESSOR_ARCHITECTURE)
|
||||||
endif
|
endif
|
||||||
endif # windows but MINGW_CHOST not defined
|
endif # windows but MINGW_CHOST not defined
|
||||||
else
|
else
|
||||||
|
ifneq ($(YQ2_OSTYPE), Darwin)
|
||||||
|
else
|
||||||
|
YQ2_ARCH ?= $(shell uname -m)
|
||||||
|
endif
|
||||||
# Normalize some abiguous YQ2_ARCH strings
|
# Normalize some abiguous YQ2_ARCH strings
|
||||||
YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/^arm.*/arm/')
|
YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/^arm.*/arm/')
|
||||||
endif
|
endif
|
||||||
|
@ -235,11 +239,7 @@ override LDFLAGS += -shared
|
||||||
# ----------
|
# ----------
|
||||||
|
|
||||||
# Extra LDFLAGS for SDL
|
# Extra LDFLAGS for SDL
|
||||||
ifeq ($(YQ2_OSTYPE), Darwin)
|
|
||||||
SDLLDFLAGS := -lSDL2
|
|
||||||
else # not Darwin
|
|
||||||
SDLLDFLAGS := $(shell sdl2-config --libs)
|
SDLLDFLAGS := $(shell sdl2-config --libs)
|
||||||
endif # Darwin
|
|
||||||
|
|
||||||
# The renderer libs don't need libSDL2main, libmingw32 or -mwindows.
|
# The renderer libs don't need libSDL2main, libmingw32 or -mwindows.
|
||||||
ifeq ($(YQ2_OSTYPE), Windows)
|
ifeq ($(YQ2_OSTYPE), Windows)
|
||||||
|
@ -280,6 +280,11 @@ ref_vk:
|
||||||
@echo "===> Building ref_vk.dll"
|
@echo "===> Building ref_vk.dll"
|
||||||
${Q}mkdir -p release
|
${Q}mkdir -p release
|
||||||
$(MAKE) release/ref_vk.dll
|
$(MAKE) release/ref_vk.dll
|
||||||
|
else ifeq ($(YQ2_OSTYPE), Darwin)
|
||||||
|
ref_vk:
|
||||||
|
@echo "===> Building ref_vk.dlylib"
|
||||||
|
${Q}mkdir -p release
|
||||||
|
$(MAKE) release/ref_vk.dylib
|
||||||
else
|
else
|
||||||
ref_vk:
|
ref_vk:
|
||||||
@echo "===> Building ref_vk.so"
|
@echo "===> Building ref_vk.so"
|
||||||
|
@ -353,6 +358,10 @@ ifeq ($(YQ2_OSTYPE), Windows)
|
||||||
release/ref_vk.dll : $(REFVK_OBJS)
|
release/ref_vk.dll : $(REFVK_OBJS)
|
||||||
@echo "===> LD $@"
|
@echo "===> LD $@"
|
||||||
${Q}$(CC) $(REFVK_OBJS) $(LDFLAGS) $(DLL_SDLLDFLAGS) -o $@
|
${Q}$(CC) $(REFVK_OBJS) $(LDFLAGS) $(DLL_SDLLDFLAGS) -o $@
|
||||||
|
else ifeq ($(YQ2_OSTYPE), Darwin)
|
||||||
|
release/ref_vk.dylib : $(REFVK_OBJS)
|
||||||
|
@echo "===> LD $@"
|
||||||
|
${Q}$(CC) $(LDFLAGS) $(REFVK_OBJS) $(LDLIBS) $(SDLLDFLAGS) -o $@
|
||||||
else
|
else
|
||||||
release/ref_vk.so : $(REFVK_OBJS)
|
release/ref_vk.so : $(REFVK_OBJS)
|
||||||
@echo "===> LD $@"
|
@echo "===> LD $@"
|
||||||
|
|
|
@ -24,8 +24,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
#include <SDL.h>
|
||||||
|
#include <SDL_vulkan.h>
|
||||||
|
#else
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
#include <SDL2/SDL_vulkan.h>
|
#include <SDL2/SDL_vulkan.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "../../common/header/ref_shared.h"
|
#include "../../common/header/ref_shared.h"
|
||||||
|
|
Loading…
Reference in New Issue