qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 12:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Pick up vulkan.h from correct location

Browse source 
Well... it could be done better, but this works for now assuming it's in
/usr/include (and it's correct for mxe builts). Does need proper
autoconfiscation, though.
This commit is contained in:
Bill Currie 2021-11-19 22:36:19 +09:00
parent e080bb333c
commit 88b3965794
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libs/video/renderer/vulkan/vkgen/Makemodule.am
View file

@ -19,7 +19,8 @@ vkgen_dat_src= \
libs/video/renderer/vulkan/vkgen/vktype.r \ libs/video/renderer/vulkan/vkgen/vktype.r \
libs/video/renderer/vulkan/vkgen/vulkan.r libs/video/renderer/vulkan/vkgen/vulkan.r
VKGENFLAGS = -I$(top_srcdir)/libs/video/renderer/vulkan/vkgen VKGENUSRINC = /usr/include
VKGENFLAGS = -I$(top_srcdir)/libs/video/renderer/vulkan/vkgen -I$(VKGENUSRINC)
vkgen_dat_SOURCES=$(vkgen_dat_src) vkgen_dat_SOURCES=$(vkgen_dat_src)
vkgen_obj=$(vkgen_dat_SOURCES:.r=.o) vkgen_obj=$(vkgen_dat_SOURCES:.r=.o)

2
libs/video/renderer/vulkan/vkgen/vulkan.r
View file

@ -1,3 +1,3 @@
#define __x86_64__ #define __x86_64__
#include </usr/include/vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "QF/Vulkan/swapchain.h" #include "QF/Vulkan/swapchain.h"

2
tools/cross/mingw/cross-make.sh
View file

@ -14,4 +14,4 @@ export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig
export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH export PATH=$MINGW/usr/bin:$PATH
make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' QWAQ='$(top_builddir)/qwaq-cmd' $* make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' QWAQ='$(top_builddir)/qwaq-cmd' VKGENUSRINC=$MINGW_USR/include $*

2
tools/cross/mingw64/cross-make.sh
View file

@ -14,4 +14,4 @@ export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig
export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH export PATH=$MINGW/usr/bin:$PATH
make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' QWAQ='$(top_builddir)/qwaq-cmd' $* make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' QWAQ='$(top_builddir)/qwaq-cmd' VKGENUSRINC=$MINGW_USR/include $*