qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 05:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Fix a pile of issues building under cygwin

Browse source 
Many thanks to jdp_ for finding them initially and getting me to take a
look at things.
This commit is contained in:
Bill Currie 2022-09-19 13:41:24 +01:00
parent 745778979a
commit ead14d7268
8 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -28,7 +28,7 @@ BUILT_SOURCES = $(top_srcdir)/.version
#AM_CFLAGS= @PREFER_NON_PIC@
AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS)
common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
common_ldflags= -export-dynamic @STATIC@ @PTHREAD_LDFLAGS@
SUFFICES =
TESTS =
@ -166,11 +166,11 @@ CLEANFILES += $(shader_DATA)
$(r_depfiles_remade):
$(MKDIR_P) $(@D)
echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r qfcc@' >$@-t && $(am__mv) $@-t $@
echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r $(QFCC)@' >$@-t && $(am__mv) $@-t $@
$(pas_depfiles_remade):
$(MKDIR_P) $(@D)
echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas qfcc@' >$@-t && $(am__mv) $@-t $@
echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas $(QFCC)@' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) $(pas_depfiles_remade)
echo findme $(ruamoko_gui_libgui_a_dep)

2
config.d/build_control.m4
View file

@ -246,7 +246,7 @@ if test "x$ENABLE_tools_qfbsp" = xyes; then
QF_NEED(libs,[models image util])
fi
if test "x$ENABLE_tools_qfcc" = xyes; then
QFCC_TARGETS="qfcc qfprogs\$(EXEEXT)"
QFCC_TARGETS="qfcc\$(EXEEXT) qfprogs\$(EXEEXT)"
QF_NEED(tools,[qfcc])
QF_NEED(libs,[gamecode util])
fi

3
config.d/windows.m4
View file

@ -19,6 +19,9 @@ case "$host_os" in
;;
cygwin*)
cygwin=yes
SYSTYPE=WIN32
AC_DEFINE(NEED_GNUPRINTF)
FNM_FLAGS="-I\$(top_srcdir)/include/win32"
if test "x$host" != "x$build"; then
CC="$host_cpu-$host_os-gcc"
AS="$CC"

2
configure.ac
View file

@ -90,7 +90,7 @@ case "${host}" in
fi
;;
i?86-*-cygwin*)
i?86-*-cygwin*|x86_64-*-cygwin*)
SYSTYPE=WIN32
AC_MSG_RESULT([Win32 driver])
WIN32_LIBS=' $(NET_LIBS)'

2
ruamoko/gui/Makemodule.am
View file

@ -15,7 +15,7 @@ ruamoko_gui_libgui_a_SOURCES= \
ruamoko/gui/View.r
ruamoko_gui_libgui_a_dep=$(call qcautodep,$(ruamoko_gui_libgui_a_SOURCES))
ruamoko_gui_libgui_a_AR= $(PAK) -cf
EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=pak
EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=$(PAK)
include $(ruamoko_gui_libgui_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_gui_libgui_a_dep)

8
ruamoko/lib/Makemodule.am
View file

@ -33,7 +33,7 @@ ruamoko_lib_libr_a_SOURCES=\
ruamoko/lib/Set.r
ruamoko_lib_libr_a_dep=$(call qcautodep,$(ruamoko_lib_libr_a_SOURCES))
ruamoko_lib_libr_a_AR=$(PAK) -cf
EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=pak
EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=$(PAK)
include $(ruamoko_lib_libr_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_lib_libr_a_dep)
@ -83,7 +83,7 @@ ruamoko_lib_libqw_a_SOURCES= \
ruamoko/lib/math.r
ruamoko_lib_libqw_a_dep=$(call qcautodep,$(ruamoko_lib_libqw_a_src))
ruamoko_lib_libqw_a_AR=$(PAK) -cf
EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=pak
EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=$(PAK)
include $(ruamoko_lib_libqw_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_lib_libqw_a_dep)
@ -94,7 +94,7 @@ ruamoko_lib_libnq_a_SOURCES=\
ruamoko/lib/math.r
ruamoko_lib_libnq_a_dep=$(call qcautodep,$(ruamoko_lib_libnq_a_src))
ruamoko_lib_libnq_a_AR=$(PAK) -cf
EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=pak
EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=$(PAK)
include $(ruamoko_lib_libnq_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_lib_libnq_a_dep)
@ -103,7 +103,7 @@ ruamoko_lib_libcsqc_a_SOURCES=\
$(ruamoko_lib_common_src)
ruamoko_lib_libcsqc_a_dep=$(call qcautodep,$(ruamoko_lib_libcsqc_a_src))
ruamoko_lib_libcsqc_a_AR= $(PAK) -cf
EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=pak
EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=$(PAK)
include $(ruamoko_lib_libcsqc_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_lib_libcsqc_a_dep)

2
ruamoko/qwaq/Makemodule.am
View file

@ -24,7 +24,7 @@ ruamoko_qwaq_libui_a_SOURCES= \
ruamoko/qwaq/ui/window.r
ruamoko_qwaq_libui_a_dep=$(call qcautodep,$(ruamoko_qwaq_libui_a_SOURCES))
ruamoko_qwaq_libui_a_AR=$(PAK) -cf
EXTRA_ruamoko_qwaq_libui_a_DEPENDENCIES=pak
EXTRA_ruamoko_qwaq_libui_a_DEPENDENCIES=$(PAK)
include $(ruamoko_qwaq_libui_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_qwaq_libui_a_dep)

2
ruamoko/scheme/Makemodule.am
View file

@ -33,7 +33,7 @@ ruamoko_scheme_libscheme_a_SOURCES=\
ruamoko/scheme/BaseContinuation.r
ruamoko_scheme_libscheme_a_dep=$(call qcautodep,$(ruamoko_scheme_libscheme_a_SOURCES))
ruamoko_scheme_libscheme_a_AR=$(PAK) -cf
EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=pak
EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=$(PAK)
include $(ruamoko_scheme_libscheme_a_dep) # am--include-marker
r_depfiles_remade += $(ruamoko_scheme_libscheme_a_dep)