Merge pull request #1652 from 86Box/master

Brought the branch up to par with master.

src/win/Makefile.mingw

@@ -778,7 +778,8 @@ VIDOBJ		:= video.o \
 		    vid_s3.o vid_s3_virge.o \
 		    vid_ibm_rgb528_ramdac.o vid_sdac_ramdac.o \
 			vid_ogc.o \
-			vid_nga.o
+			vid_nga.o \
+			vid_tvp3026_ramdac.o
 
 VOODOOOBJ	:= vid_voodoo.o vid_voodoo_banshee.o \
 		    vid_voodoo_banshee_blitter.o \
@@ -837,7 +838,7 @@ LIBS    += -static
 ifeq ($(AUTODEP), y)
 %.o:		%.c
 		@echo $<
-		$(CC) $(CFLAGS) $(DEPS) -c $<
+		@$(CC) $(CFLAGS) $(DEPS) -c $<
 
 %.o:		%.cc
 		@echo $<

src/win/win_sdl.c

@@ -288,7 +288,8 @@ sdl_destroy_texture(void)
 void
 sdl_close(void)
 {
-    SDL_LockMutex(sdl_mutex);
+    if (sdl_mutex != NULL)
+	SDL_LockMutex(sdl_mutex);
 
     /* Unregister our renderer! */
     video_setblit(NULL);