yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-21 11:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove artificial Linux only limitation for the Vulkan renderer.

Browse source
This commit is contained in:
Yamagi 2020-01-25 15:39:09 +01:00
parent eb935da156
commit c895d004d2
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Makefile
View file

@ -57,7 +57,7 @@ WITH_SYSTEMDIR:=""
OSX_APP:=yes
# Build vulkan render
WITH_REFVK:=no
WITH_REFVK:=yes
# This is an optional configuration file, it'll be used in
# case of presence.
@ -661,9 +661,16 @@ build/ref_soft/%.o: %.c
# ----------
# The vk renderer lib
#
ifeq ($(YQ2_OSTYPE), Windows)
ref_vk:
@echo "===> Building ref_vk.dll"
$(MAKE) release/ref_vk.dll
ifeq ($(YQ2_OSTYPE), Linux)
ifeq ($(WITH_REFVK),yes)
release/ref_vk.dll : CFLAGS += -fPIC
release/ref_vk.dll : CPPFLAGS += -fPIC
release/ref_vk.dll : LDFLAGS += -shared -lm -lvulkan -lstdc++
else
ref_vk:
@echo "===> Building ref_vk.so"
$(MAKE) release/ref_vk.so
@ -671,14 +678,7 @@ ref_vk:
release/ref_vk.so : CFLAGS += -fPIC
release/ref_vk.so : CPPFLAGS += -fPIC
release/ref_vk.so : LDFLAGS += -shared -lm -lvulkan -lstdc++
else
ref_vk:
@echo "===> Vulkan render disabled"
endif
else
ref_vk:
@echo "===> Vulkan render unsupported"
endif # OS specific ref_vk stuff
build/ref_vk/%.o: %.c
@echo "===> CC $<"
@ -1167,7 +1167,11 @@ release/ref_soft.so : $(REFSOFT_OBJS)
endif
# release/ref_vk.so
ifeq ($(YQ2_OSTYPE), Linux)
ifeq ($(YQ2_OSTYPE), Windows)
release/ref_vk.dll : $(REFVK_OBJS)
@echo "===> LD $@"
${Q}$(CC) $(REFVK_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
else
release/ref_vk.so : $(REFVK_OBJS)
@echo "===> LD $@"
${Q}$(CC) $(REFVK_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@