--- sbbs/src/conio/gnumakefile	2018/04/24 16:41:23	1.1.1.1
+++ sbbs/src/conio/gnumakefile	2018/04/24 16:42:19	1.1.1.2
@@ -8,40 +8,48 @@ OBJS	+=	$(MTOBJODIR)$(DIRSEP)curs_cio$(O
 ifdef NO_X
  CFLAGS	+=	-DNO_X
 else
- OBJS	+=	$(MTOBJODIR)$(DIRSEP)console$(OFILE) \
+ OBJS	+=	$(MTOBJODIR)$(DIRSEP)x_events$(OFILE) \
 			$(MTOBJODIR)$(DIRSEP)x_cio$(OFILE)
+ NEED_BITMAP := 1
 endif
 
-ifdef WITH_SDL
+ifdef WITH_SDL_AUDIO
  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE)
+ NEED_BITMAP := 1
+else
+ ifdef WITH_SDL
+  NEED_BITMAP := 1
+  OBJS	+=	$(MTOBJODIR)$(DIRSEP)sdl_con$(OFILE)
+  OBJS	+=      $(MTOBJODIR)$(DIRSEP)sdlfuncs$(OFILE)
+  ifeq ($(os),darwin)
+   OBJS 	+=      $(MTOBJODIR)$(DIRSEP)SDLMain$(OFILE)
+  endif
+ endif
 endif
 
 ifeq ($(os),netbsd)
- CFLAGS	+=	-DN_CURSES_LIB
+ ifndef USE_SYSTEM_CURSES
+  CFLAGS	+=	-DN_CURSES_LIB
+ endif
 endif
 
-$(MTOBJODIR)$(DIRSEP)console$(OFILE).static:
-	$(QUIET)$(DELETE) $(MTOBJODIR)$(DIRSEP)console$(OFILE)*
-	$(QUIET)touch $(MTOBJODIR)$(DIRSEP)console$(OFILE).static
-
-$(MTOBJODIR)$(DIRSEP)console$(OFILE).dynamic:
-	$(QUIET)$(DELETE) $(MTOBJODIR)$(DIRSEP)console$(OFILE)*
-	$(QUIET)touch $(MTOBJODIR)$(DIRSEP)console$(OFILE).dynamic
+ifdef NEED_BITMAP
+ OBJS	+=	$(MTOBJODIR)$(DIRSEP)bitmap_con$(OFILE)
+endif
 
 # CIOLIB Library Link Rule
-ifdef STATIC
-$(CIOLIB-MT_BUILD): $(MTOBJODIR)$(DIRSEP)console$(OFILE).static $(MTOBJODIR) $(OBJS)
-else
-$(CIOLIB-MT_BUILD): $(MTOBJODIR)$(DIRSEP)console$(OFILE).dynamic $(MTOBJODIR) $(OBJS)
-endif
+$(CIOLIB-MT_BUILD): $(MTOBJODIR) $(OBJS)
 	@echo Creating $@ ...
 	$(QUIET)$(AR) rc $@ $(OBJS)
 	$(QUIET)$(RANLIB) $@
 
-ifdef STATIC
-$(CIOLIB-MT_SHLIB_BUILD): $(MTOBJODIR)$(DIRSEP)console$(OFILE).static $(MTOBJODIR) $(OBJS)
-else
-$(CIOLIB-MT_SHLIB_BUILD): $(MTOBJODIR)$(DIRSEP)console$(OFILE).dynamic $(MTOBJODIR) $(OBJS)
-endif
+$(CIOLIB-MT_SHLIB_BUILD): $(MTOBJODIR) $(OBJS)
 	@echo Creating $@
 	$(QUIET)$(MKSHLIB) $(LDFLAGS) $(OBJS) $(SHLIBOPTS) -o $@
+
+ifeq ($(os),darwin)
+$(MTOBJODIR)$(DIRSEP)SDLMain$(OFILE): SDLMain.m
+	@echo $(COMPILE_MSG) $<
+	$(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) -o $@ -c $<
+endif
+