Borland SDL stuff...

src/conio/Common.bmake

+!ifdef USE_SDL
+CIOLIB-MT_CFLAGS = $(CIOLIB-MT_CFLAGS) -DWITH_SDL -DWIN32 -I../../include/sdl
+CIOLIB_CFLAGS = $(CIOLIB_CFLAGS) -DWITH_SDL -DWIN32 -I../../include/sdl
+!ifdef STATIC_SDL
+CIOLIB-MT_CFLAGS = $(CIOLIB-MT_CFLAGS) -DSTATIC_SDL
+CIOLIB_CFLAGS = $(CIOLIB_CFLAGS) -DSTATIC_SDL
+!endif
+!else
+CIOLIB-MT_CFLAGS = $(CIOLIB-MT_CFLAGS) -DNO_FONTS
+CIOLIB_CFLAGS = $(CIOLIB_CFLAGS) -DNO_FONTS
+!endif

src/conio/Makefile

@@ -20,8 +20,15 @@ SRC_ROOT = ..
 # Cross platform/compiler definitions
 !include ..\build\Common.bmake	# defines clean and output directory rules
 
-!ifdef USE_SDL
+!ifdef USE_SDL_AUDIO
 OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE)
+!else
+!ifdef USE_SDL
+OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
+OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
+OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
+OBJS		= $(OBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
+!endif
 !endif
 
 #The following is necessary only when DLL-exporting wrapper functions

src/xpdev/Common.bmake

 XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DXPDEV_THREAD_SAFE
-!ifdef USE_SDL
-XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DWITH_SDL -DWIN32 -I../../include/sdl
-XPDEV_CFLAGS = $(XPDEV_CFLAGS) -DWITH_SDL -DWIN32 -I../../include/sdl
+!ifdef USE_SDL_AUDIO
+XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DWITH_SDL_AUDIO -DWIN32 -I../../include/sdl
+XPDEV_CFLAGS = $(XPDEV_CFLAGS) -DWITH_SDL_AUDIO -DWIN32 -I../../include/sdl
 !ifdef STATIC_SDL
 XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DSTATIC_SDL
 XPDEV_CFLAGS = $(XPDEV_CFLAGS) -DSTATIC_SDL

src/xpdev/Makefile

@@ -13,7 +13,7 @@ CFLAGS	=	$(CFLAGS) -DWRAPPER_EXPORTS=1
 
 MT_CFLAGS = $(MT_CFLAGS) -DLINK_LIST_THREADSAFE
 
-!ifdef USE_SDL
+!ifdef USE_SDL_AUDIO
 MTOBJS		= $(MTOBJS) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
 MTOBJS		= $(MTOBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 OBJS		= $(OBJS) $(OBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)