--- sbbs/src/xpdev/common.gmake	2018/04/24 16:41:24	1.1
+++ sbbs/src/xpdev/common.gmake	2018/04/24 16:45:44	1.1.1.2
@@ -26,6 +26,10 @@ ifeq ($(shell if [ -c /dev/urandom ] ; t
  XPDEV-MT_CFLAGS	+=	-DHAS_DEV_URANDOM -DURANDOM_DEV=\"/dev/urandom\"
  XPDEV_CFLAGS		+=	-DHAS_DEV_URANDOM -DURANDOM_DEV=\"/dev/urandom\"
 endif
+ifeq ($(shell if [ -L /dev/urandom ] ; then echo YES ; fi),YES)
+ XPDEV-MT_CFLAGS	+=	-DHAS_DEV_URANDOM -DURANDOM_DEV=\"/dev/urandom\"
+ XPDEV_CFLAGS		+=	-DHAS_DEV_URANDOM -DURANDOM_DEV=\"/dev/urandom\"
+endif
 ifeq ($(shell if [ -c /dev/random ] ; then echo YES ; fi),YES)
  XPDEV-MT_CFLAGS	+=	-DHAS_DEV_RANDOM -DRANDOM_DEV=\"/dev/random\"
  XPDEV_CFLAGS		+=	-DHAS_DEV_RANDOM -DRANDOM_DEV=\"/dev/random\"
@@ -70,28 +74,35 @@ ifeq ($(os),darwin)
 endif
 
 # Find SDL headers!
-ifndef WITHOUT_SDL
- ifndef SDL_CONFIG
+ifdef USE_SDL_AUDIO
+ ifdef SDL_CONFIG
+  ifeq ($(shell ${SDL_CONFIG} --cflags > /dev/null 2>&1 && echo YES),YES)
+   WITH_SDL_AUDIO	:=	1
+  endif
+ else
   ifeq ($(os),darwin)
    ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
-    WITH_SDL	:=	1
+    SDL_FRAMEWORK_PATH	?=	/Library/Frameworks
+   endif
+   ifdef SDL_FRAMEWORK_PATH
+    WITH_SDL_AUDIO	:=	1
    endif
   else
    ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
     SDL_CONFIG := sdl-config
-    WITH_SDL	:=	1
+    WITH_SDL_AUDIO	:=	1
    else
     ifeq ($(shell sdl13-config --cflags > /dev/null 2>&1 && echo YES),YES)
      SDL_CONFIG := sdl13-config
-     WITH_SDL	:=	1
+     WITH_SDL_AUDIO	:=	1
     else
      ifeq ($(shell sdl12-config --cflags > /dev/null 2>&1 && echo YES),YES)
       SDL_CONFIG := sdl12-config
-      WITH_SDL	:=	1
+      WITH_SDL_AUDIO	:=	1
      else
       ifeq ($(shell sdl11-config --cflags > /dev/null 2>&1 && echo YES),YES)
        SDL_CONFIG := sdl11-config
-       WITH_SDL	:=	1
+       WITH_SDL_AUDIO	:=	1
       endif
      endif
     endif
@@ -100,12 +111,16 @@ ifndef WITHOUT_SDL
  endif
 endif
 
-ifdef WITH_SDL
+ifdef STATIC
+ STATIC_SDL := true
+endif
+
+ifdef WITH_SDL_AUDIO
  ifdef SDL_CONFIG
   ifeq ($(shell ${SDL_CONFIG} --cflags > /dev/null 2>&1 && echo YES),YES)
-   XPDEV-MT_CFLAGS	+=	-DWITH_SDL
+   XPDEV-MT_CFLAGS	+=	-DWITH_SDL_AUDIO
    XPDEV-MT_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
-   XPDEV_CFLAGS	+=	-DWITH_SDL
+   XPDEV_CFLAGS	+=	-DWITH_SDL_AUDIO
    XPDEV_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
    ifdef STATIC_SDL
     XPDEV-MT_LIBS	+=	$(shell $(SDL_CONFIG) --static-libs)
@@ -129,17 +144,17 @@ ifdef WITH_SDL
   endif
  else
   ifeq ($(os),darwin)
-   XPDEV-MT_CFLAGS	+=	-DWITH_SDL -DSTATIC_SDL
-   XPDEV-MT_CFLAGS	+=	-I/Library/Frameworks/SDL.framework/Headers
-   XPDEV-MT_LIBS	+=	-framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
-   XPDEV_CFLAGS	+=	-DWITH_SDL -DSTATIC_SDL
-   XPDEV_CFLAGS	+=	-I/Library/Frameworks/SDL.framework/Headers
-   XPDEV_LIBS	+=	-framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
+   XPDEV-MT_CFLAGS	+=	-DWITH_SDL_AUDIO -DSTATIC_SDL
+   XPDEV-MT_CFLAGS	+=	-I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
+   XPDEV-MT_LIBS	+=	-F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
+   XPDEV_CFLAGS	+=	-DWITH_SDL_AUDIO -DSTATIC_SDL
+   XPDEV_CFLAGS	+=	-I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
+   XPDEV_LIBS	+=	-F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
   endif
  endif
 endif
 
-X_PATH ?=      $(shell if [ -f /usr/X11R6/include/X11/Xlib.h ]; then echo /usr/X11R6 ; elif [ -f /usr/X11R7/include/X11/Xlib.h ] ; then echo /usr/X11R7 ; elif [ -f /usr/X11/include/X11/Xlib.h ] ; then echo /usr/X11 ; elif [ -f /usr/X/include/X11/Xlib.h ] ; then echo /usr/X ; elif [ -f /usr/include/X11/Xlib.h ] ; then echo /usr ; else echo 0 ; fi)
+X_PATH ?=      $(shell if [ -f /usr/X11R6/include/X11/Xlib.h ]; then echo /usr/X11R6 ; elif [ -f /usr/local/include/X11/Xlib.h ] ; then echo /usr/local ; elif [ -f /usr/X11R7/include/X11/Xlib.h ] ; then echo /usr/X11R7 ; elif [ -f /usr/X11/include/X11/Xlib.h ] ; then echo /usr/X11 ; elif [ -f /usr/X/include/X11/Xlib.h ] ; then echo /usr/X ; elif [ -f /usr/include/X11/Xlib.h ] ; then echo /usr ; else echo 0 ; fi)
 
 ifeq ($(os),sunos)
  X_PATH	?=	/usr/X
@@ -160,3 +175,11 @@ endif
 
 XPDEV-MT_CFLAGS	+=	-I$(X_HEADERS)
 XPDEV_CFLAGS	+=	-I$(X_HEADERS)
+
+ifndef WITHOUT_PORTAUDIO
+ PORTAUDIO_PATH ?=      $(shell if [ -f /usr/local/include/portaudio.h ]; then echo /usr/local ; elif [ -f /usr/include/portaudio.h ] ; then echo /usr ; else echo NOTFOUND ; fi)
+
+ ifneq ($(PORTAUDIO_PATH),NOTFOUND)
+  XPDEV_CFLAGS += -DWITH_PORTAUDIO
+ endif
+endif