From 0c95de1075167a684757b5a28b02c642d0c67fce Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Tue, 17 Jul 2018 22:48:46 +0200
Subject: [PATCH] Some bugfixes and C++ files are now optimized; Jenkins builds
 now also have build number in the title bar.

---
 src/cpu/cpu_table.c    | 3 +--
 src/video/video.h      | 4 ++--
 src/win/Makefile.mingw | 4 ++--
 src/win/win_ddraw.cpp  | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index a715caa43..bf978c9fc 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -29,7 +29,7 @@
  *		16 = 180 MHz
  *		17 = 200 MHz
  *
- * Version:	@(#)cpu_table.c	1.0.4	2018/02/18
+ * Version:	@(#)cpu_table.c	1.0.5	2018/07/17
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		leilei,
@@ -60,7 +60,6 @@ CPU cpus_8088[] = {
     {"8088/12",      CPU_8088,  3, 12000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
     {"8088/16",      CPU_8088,  4, 16000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
 #endif
-    {"286/6",        CPU_286,   0,  6000000,    1, 0, 0, 0, 0, 0, 2,2,2,2, 1},
     {"",             -1,        0, 0,           0, 0, 0, 0, 0, 0, 0,0,0,0}
 };
 
diff --git a/src/video/video.h b/src/video/video.h
index fcbe160e0..fec490fb3 100644
--- a/src/video/video.h
+++ b/src/video/video.h
@@ -8,7 +8,7 @@
  *
  *		Definitions for the video controller module.
  *
- * Version:	@(#)video.h	1.0.28	2018/05/25
+ * Version:	@(#)video.h	1.0.29	2018/07/17
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -147,7 +147,7 @@ typedef struct {
 typedef struct {
     int		w, h;
     uint8_t	*dat;
-    uint8_t	*line[];
+    uint8_t	*line[2048];
 } bitmap_t;
 
 typedef struct {
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 04fffeff3..14080b8cb 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -8,7 +8,7 @@
 #
 #		Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.118	2018/05/26
+# Version:	@(#)Makefile.mingw	1.0.119	2018/07/17
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -404,7 +404,7 @@ endif
 CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 		   $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
 		   -fno-strict-aliasing
-CFLAGS		:= $(CFLAGS)
+CXXFLAGS	:= $(CFLAGS)
 
 
 #########################################################################
diff --git a/src/win/win_ddraw.cpp b/src/win/win_ddraw.cpp
index b235bcf84..5168be9e2 100644
--- a/src/win/win_ddraw.cpp
+++ b/src/win/win_ddraw.cpp
@@ -11,7 +11,7 @@
  * NOTES:	This code should be re-merged into a single init() with a
  *		'fullscreen' argument, indicating FS mode is requested.
  *
- * Version:	@(#)win_ddraw.cpp	1.0.9	2018/05/26
+ * Version:	@(#)win_ddraw.cpp	1.0.10	2018/07/17
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -104,7 +104,6 @@ bgra_to_rgb(png_bytep *b_rgb, uint8_t *bgra, int width, int height)
 {
     int i, j;
     uint8_t *r, *b;
-    uint32_t *rgb = (uint32_t *) bgra;
 
     if (video_grayscale || invert_display)
 	*bgra = video_color_transform(*bgra);
@@ -428,7 +427,6 @@ ddraw_blit(int x, int y, int y1, int y2, int w, int h)
     POINT po;
     HRESULT hr;
     int yy;
-    uint32_t *p, *q;
 
     if (lpdds_back == NULL) {
 	video_blit_complete();