qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-04 08:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix window build for recent config changes

Browse source 
And, more importantly get curl working in the mxe build.
This commit is contained in:
Bill Currie 2023-11-23 17:16:53 +09:00
parent 7a2a61d365
commit c9cfd9e8cf
4 changed files with 50 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -26,7 +26,7 @@ NOCONV_DIST= \
BUILT_SOURCES = $(top_srcdir)/.version
#AM_CFLAGS= @PREFER_NON_PIC@
AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS) $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS) $(VULKAN_CPPFLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS) $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS) $(VULKAN_CPPFLAGS) $(LIBCURL_CFLAGS)
common_ldflags= -export-dynamic @STATIC@ @PTHREAD_LDFLAGS@

65
configure.ac
View file

@ -164,28 +164,49 @@ fi
TOPSRC=`readlink -f ${srcdir}`
AC_SUBST(TOPSRC)
QF_REQUIRES([
[libasound2-dev, HAVE_ALSA],
[libjack-jackd2-dev, HAVE_JACK],
[libsamplerate0-dev, HAVE_SAMPLERATE],
[libflac-dev, HAVE_FLAC],
[libogg-dev, HAVE_OGG],
[libvorbis-dev, HAVE_VORBIS],
[libpng-dev, HAVE_PNG],
[zlib1g-dev, HAVE_ZLIB],
[libcurl4-openssl-dev, HAVE_LIBCURL],
[libncurses5-dev, HAVE_NCURSES],
[libxext-dev, HAVE_X],
[libxxf86dga-dev, HAVE_DGA],
[libxxf86vm-dev, HAVE_VIDMODE],
[libxi-dev, HAVE_XI2],
[libxfixes-dev, HAVE_XFIXES],
[libvulkan-dev, HAVE_VULKAN],
[glslang-tools, HAVE_GLSLANG],
[libfontconfig-dev, HAVE_FONTCONFIG],
[libfreetype-dev, HAVE_FREETYPE],
[libharfbuzz-dev, HAVE_HARFBUZZ],
])
case "${host}" in
i?86-*-mingw32*|x86_64-w64-mingw32*)
QF_REQUIRES([
[libsamplerate, HAVE_SAMPLERATE],
[flac, HAVE_FLAC],
[ogg, HAVE_OGG],
[vorbis, HAVE_VORBIS],
[libpng, HAVE_PNG],
[zlib, HAVE_ZLIB],
[curl, HAVE_LIBCURL],
[ncurses, HAVE_NCURSES],
[vulkan-dev, HAVE_VULKAN],
[glslang-tools, HAVE_GLSLANG],
[fontconfig, HAVE_FONTCONFIG],
[freetype, HAVE_FREETYPE],
[harfbuzz, HAVE_HARFBUZZ],
])
;;
*linux*)
QF_REQUIRES([
[libasound2-dev, HAVE_ALSA],
[libjack-jackd2-dev, HAVE_JACK],
[libsamplerate0-dev, HAVE_SAMPLERATE],
[libflac-dev, HAVE_FLAC],
[libogg-dev, HAVE_OGG],
[libvorbis-dev, HAVE_VORBIS],
[libpng-dev, HAVE_PNG],
[zlib1g-dev, HAVE_ZLIB],
[libcurl4-openssl-dev, HAVE_LIBCURL],
[libncurses5-dev, HAVE_NCURSES],
[libxext-dev, HAVE_X],
[libxxf86dga-dev, HAVE_DGA],
[libxxf86vm-dev, HAVE_VIDMODE],
[libxi-dev, HAVE_XI2],
[libxfixes-dev, HAVE_XFIXES],
[libvulkan-dev, HAVE_VULKAN],
[glslang-tools, HAVE_GLSLANG],
[libfontconfig-dev, HAVE_FONTCONFIG],
[libfreetype-dev, HAVE_FREETYPE],
[libharfbuzz-dev, HAVE_HARFBUZZ],
])
;;
esac
dnl[vulkan-validationlayers, HAVE_],
dnl Output files

5
qw/source/cl_http.c
View file

@ -35,6 +35,11 @@
#include <curl/curl.h>
#ifdef _WIN32
//windows defines this, but of course it conflicts with progs
#undef E_POINTER
#endif
#include "QF/dstring.h"
#include "QF/sys.h"

1
tools/cross/mingw64/cross-configure.sh
View file

@ -17,6 +17,7 @@ export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH
export QCSYSPREFIX=$MINGW_USR
../../configure \
--enable-silent-rules \
--host=x86_64-w64-mingw32.static \
--disable-shared \
$*