From 113303c7307681fa661ba5b508c2bdd38178a920 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 1 Apr 2022 16:01:11 -0500 Subject: [PATCH] build: Do not cross-compile demos if demos are not enabled. Signed-off-by: Zebediah Figura Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- Makefile.am | 12 ++++++++---- configure.ac | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e7737be..3549cce5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,8 +445,10 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) +if BUILD_DEMOS +CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +endif CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe CLEANFILES += $(CROSS32_FILES) @@ -477,8 +479,10 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) +if BUILD_DEMOS +CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +endif CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe CLEANFILES += $(CROSS64_FILES) diff --git a/configure.ac b/configure.ac index 77fa41c8..97551d89 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,7 @@ AC_OUTPUT dnl Output configuration summary AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) + [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" @@ -177,8 +177,10 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} Building documentation: ${HAVE_DOCS} +"]) - Building crosstests: ${HAVE_CROSSTEST}"]) +AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO([" Cross-compiling demos: ${HAVE_CROSSTARGET}"])]) +AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([])