qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some mxe build issues

This commit is contained in:
Bill Currie 2023-03-25 21:36:45 +09:00
parent 2dd3ea2182
commit c3558091ac
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.d/vulkan.m4
View File

@ -16,7 +16,7 @@ if test "x$HAVE_VULKAN" != xno; then
VULKAN_QCFLAGS="-I$VULKAN_SDK/include" VULKAN_QCFLAGS="-I$VULKAN_SDK/include"
VULKAN_LDFLAGS="-L$VULKAN_SDK/lib" VULKAN_LDFLAGS="-L$VULKAN_SDK/lib"
],[ ],[
VULKAN_QCFLAGS="-I/usr/include" VULKAN_QCFLAGS="-I${QCSYSPREFIX-/usr}/include"
]) ])
], [HAVE_VULKAN=no]) ], [HAVE_VULKAN=no])
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"

2
libs/ecs/entity.c
View File

@ -120,7 +120,7 @@ Ent_RemoveComponent (uint32_t ent, uint32_t comp, ecs_registry_t *registry)
if (subpool->num_ranges - subpool->available) { if (subpool->num_ranges - subpool->available) {
uint32_t range_count = subpool->num_ranges - subpool->available; uint32_t range_count = subpool->num_ranges - subpool->available;
uint32_t *range = find_range (subpool, ind); uint32_t *range = find_range (subpool, ind);
while (range - subpool->ranges < range_count) { while ((size_t) (range - subpool->ranges) < range_count) {
uint32_t end = --*range; uint32_t end = --*range;
range++; range++;
if (ind < end) { if (ind < end) {

2
libs/video/renderer/vulkan/vulkan_draw.c
View File

@ -72,7 +72,7 @@
#include "r_internal.h" #include "r_internal.h"
#include "vid_vulkan.h" #include "vid_vulkan.h"
static const char *draw_pass_names[] = { static const char * __attribute__((used)) draw_pass_names[] = {
"2d", "2d",
}; };

1
tools/cross/mingw/cross-configure.sh
View File

@ -14,6 +14,7 @@ export MINGW_USR=$MINGW/usr/i686-w64-mingw32.static
export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig 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
export QCSYSPREFIX=$MINGW_USR
../../configure \ ../../configure \
--host=i686-w64-mingw32.static \ --host=i686-w64-mingw32.static \
--disable-shared \ --disable-shared \

2
tools/cross/mingw64/cross-configure.sh
View File

@ -5,6 +5,7 @@ cd native
../../configure \ ../../configure \
--enable-silent-rules \ --enable-silent-rules \
--disable-shared \ --disable-shared \
--disable-optimize \
--without-clients \ --without-clients \
--without-servers \ --without-servers \
--with-tools=qfcc,pak,qwaq --with-tools=qfcc,pak,qwaq
@ -14,6 +15,7 @@ export MINGW_USR=$MINGW/usr/x86_64-w64-mingw32.static
export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig 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
export QCSYSPREFIX=$MINGW_USR
../../configure \ ../../configure \
--host=x86_64-w64-mingw32.static \ --host=x86_64-w64-mingw32.static \
--disable-shared \ --disable-shared \