diff --git a/src/conio/Common.bmake b/src/conio/Common.bmake
new file mode 100644
index 0000000000000000000000000000000000000000..6afdcff2ff966f0bb3ab8cf2b7ea86aad5f5bab3
--- /dev/null
+++ b/src/conio/Common.bmake
@@ -0,0 +1,11 @@
+!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
diff --git a/src/conio/Makefile b/src/conio/Makefile
index 369b561ded7e62d1ae86adc3ee7c73579c869f13..946b0600f38a82cbe1c82d3198072c001e1786fa 100644
--- a/src/conio/Makefile
+++ b/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
diff --git a/src/xpdev/Common.bmake b/src/xpdev/Common.bmake
index b22d0f532fae3358ae591bdd7dd4bbb11d4fb20b..308764ac30888731b19798a2339ae2c1aa23f7e0 100644
--- a/src/xpdev/Common.bmake
+++ b/src/xpdev/Common.bmake
@@ -1,7 +1,7 @@
 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
diff --git a/src/xpdev/Makefile b/src/xpdev/Makefile
index 10b959a8bf497446a610919b30f36cfd755e013b..4c2d0586b4507e0eb9622f59e6a184ed4b9d271f 100644
--- a/src/xpdev/Makefile
+++ b/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)