From 3de37030da448bbdd10a740e83db32582cfbae2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net> Date: Mon, 30 Sep 2024 20:52:08 -0400 Subject: [PATCH] Fixups for build changes. Sneaky hiding extra interesting bits at the end like that. :( --- src/xpdev/Common.gmake | 3 ++- src/xpdev/GNUmakefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake index e929101f7b..578b61fba6 100644 --- a/src/xpdev/Common.gmake +++ b/src/xpdev/Common.gmake @@ -57,7 +57,8 @@ ifndef win XPDEV-MT_CFLAGS += -DHAS_MACHINE_SPKR_H XPDEV_CFLAGS += -DHAS_MACHINE_SPKR_H endif - XPDEV-MT_CFLAGS += -DSOUNDCARD_H_IN=$(shell if [ -f /usr/include/sys/soundcard.h ] ; then echo 1 ; elif [ -f /usr/include/soundcard.h ] ; then echo 2 ; elif [ -f /usr/include/linux/soundcard.h ] ; then echo 3 ; else echo 0 ; fi) -I. $(XPDEV_CFLAGS) + XPDEV-MT_CFLAGS += -DSOUNDCARD_H_IN=$(shell if [ -f /usr/include/sys/soundcard.h ] ; then echo 1 ; elif [ -f /usr/include/soundcard.h ] ; then echo 2 ; elif [ -f /usr/include/linux/soundcard.h ] ; then echo 3 ; else echo 0 ; fi) + XPDEV_CFLAGS += -DSOUNDCARD_H_IN=$(shell if [ -f /usr/include/sys/soundcard.h ] ; then echo 1 ; elif [ -f /usr/include/soundcard.h ] ; then echo 2 ; elif [ -f /usr/include/linux/soundcard.h ] ; then echo 3 ; else echo 0 ; fi) endif # FreeBSD, OpenBSD, NetBSD, Linux, SunOS, and Darwin all have random()/srandom() diff --git a/src/xpdev/GNUmakefile b/src/xpdev/GNUmakefile index ae38daff5e..9788fbbc7a 100644 --- a/src/xpdev/GNUmakefile +++ b/src/xpdev/GNUmakefile @@ -15,6 +15,7 @@ ifndef NO_PULSEAUDIO endif endif +CFLAGS += -I. $(XPDEV_CFLAGS) ifndef WITHOUT_ALSA_SOUND ifeq ($(shell if [ -f /usr/include/alsa/asoundlib.h ] ; then echo YES ; fi),YES) CFLAGS += -DUSE_ALSA_SOUND -- GitLab