--- sbbs/src/xpdev/gnumakefile 2018/04/24 16:41:24 1.1 +++ sbbs/src/xpdev/gnumakefile 2018/04/24 16:45:23 1.1.1.2 @@ -8,11 +8,11 @@ MTOBJS += $(MTOBJODIR)$(DIRSEP)xpevent$( 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) ifeq ($(shell if [ -f /usr/include/alsa/asoundlib.h ] ; then echo YES ; fi),YES) -# CFLAGS += -DUSE_ALSA_SOUND + CFLAGS += -DUSE_ALSA_SOUND endif MT_CFLAGS += $(XPDEV-MT_CFLAGS) -ifdef WITH_SDL +ifdef WITH_SDL_AUDIO MTOBJS += $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE) OBJS += $(OBJODIR)$(DIRSEP)sdlfuncs$(OFILE) ifeq ($(os),darwin) @@ -34,7 +34,11 @@ endif # Executable Build Rule $(WRAPTEST): $(MTOBJODIR)/wraptest.o $(DEPS) @echo Linking $@ - $(QUIET)$(CC) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $^ $(XPDEV-MT_LIBS) + $(QUIET)$(CC) -o $@ $(LDFLAGS) $(MT_LDFLAGS) $^ $(XPDEV-MT_LIB_BUILD) + +$(XPTIME): $(OBJODIR)/xptime.o $(XPDEV_LIB_BUILD) + @echo Linking $@ + $(QUIET)$(CC) -o $@ $(LDFLAGS) $^ $(XPDEV_LIB_BUILD) $(XPDEV_LIB_BUILD): $(OBJODIR) $(OBJS) @echo Creating $@