diff --git a/src/xpdev/Common.bmake b/src/xpdev/Common.bmake
index eac7b01c5e73096f38e43c689610d08cfae77e10..84d152df1eedf21bf1516214c424627cf33e347d 100644
--- a/src/xpdev/Common.bmake
+++ b/src/xpdev/Common.bmake
@@ -1,9 +1,11 @@
 !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 STATIC_SDL
 XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DSTATIC_SDL
+XPDEV_CFLAGS = $(XPDEV_CFLAGS) -DSTATIC_SDL
 !endif
 !else
 XPDEV-MT_CFLAGS = $(XPDEV-MT_CFLAGS) -DNO_FONTS
-XPDEV-CFLAGS = $(XPDEV-MT_CFLAGS) -DNO_FONTS
+XPDEV-CFLAGS = $(XPDEV_CFLAGS) -DNO_FONTS
 !endif
diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake
index 6631ce658c93d0e9ba0884ddbd490beae4b5ae5e..b91b70ea9fcb3129fdd5b820157c8937434faa05 100644
--- a/src/xpdev/Common.gmake
+++ b/src/xpdev/Common.gmake
@@ -104,9 +104,13 @@ ifdef WITH_SDL
   ifeq ($(shell ${SDL_CONFIG} --cflags > /dev/null 2>&1 && echo YES),YES)
    XPDEV-MT_CFLAGS	+=	-DWITH_SDL
    XPDEV-MT_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
+   XPDEV_CFLAGS	+=	-DWITH_SDL
+   XPDEV_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
    ifdef STATIC_SDL
     XPDEV-MT_LIBS	+=	$(shell $(SDL_CONFIG) --static-libs)
     XPDEV-MT_CFLAGS	+=	-DSTATIC_SDL
+    XPDEV-LIBS	+=	$(shell $(SDL_CONFIG) --static-libs)
+    XPDEV-CFLAGS	+=	-DSTATIC_SDL
    endif
   endif
  else
@@ -114,6 +118,9 @@ ifdef WITH_SDL
    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
   endif
  endif
 endif
@@ -138,3 +145,4 @@ else
 endif
 
 XPDEV-MT_CFLAGS	+=	-I$(X_HEADERS)
+XPDEV_CFLAGS	+=	-I$(X_HEADERS)
diff --git a/src/xpdev/GNUmakefile b/src/xpdev/GNUmakefile
index 8329b17ced073225b43afecd95572261c584b01d..79f9bf645f0a4331677d731b0a2b878c9d51e320 100644
--- a/src/xpdev/GNUmakefile
+++ b/src/xpdev/GNUmakefile
@@ -14,11 +14,13 @@ MT_CFLAGS	+=	$(XPDEV-MT_CFLAGS)
 
 ifdef WITH_SDL
  MTOBJS	+=	$(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
+ OBJS	+=	$(OBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 endif
 
 ifeq ($(os),darwin)
  ifdef WITH_SDL
   MTOBJS	+=	$(MTOBJODIR)$(DIRSEP)SDLMain$(OFILE)
+  OBJS	+=	$(OBJODIR)$(DIRSEP)SDLMain$(OFILE)
  endif
 endif
 
diff --git a/src/xpdev/Makefile b/src/xpdev/Makefile
index 73ab8776e173617ffd0be515f3cfdd7d259399a4..31f2e9a033ccbc4d028f98e55397b0b45aaef8ed 100644
--- a/src/xpdev/Makefile
+++ b/src/xpdev/Makefile
@@ -13,6 +13,8 @@ MT_CFLAGS = $(MT_CFLAGS) -DLINK_LIST_THREADSAFE
 !ifdef USE_SDL
 MTOBJS		= $(MTOBJS) $(MTOBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
 MTOBJS		= $(MTOBJS) $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
+OBJS		= $(OBJS) $(OBJODIR)$(DIRSEP)SDL_win32_main$(OFILE)
+OBJS		= $(OBJS) $(OBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
 !endif
 
 $(WRAPTEST): $(XPDEV-MT_LIB_BUILD) $(TESTOBJS) $(EXEODIR)