80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Some bugfixes and C++ files are now optimized;

Browse Source 
Jenkins builds now also have build number in the title bar.
This commit is contained in:
OBattler
2018-07-17 22:48:46 +02:00
parent 22dd3c6cbe
commit 0c95de1075
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/cpu_table.c
View File

@@ -29,7 +29,7 @@
* 16 = 180 MHz * 16 = 180 MHz
* 17 = 200 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/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei, * 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/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}, {"8088/16", CPU_8088, 4, 16000000, 1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
#endif #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} {"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0}
}; };

4
src/video/video.h
View File

@@ -8,7 +8,7 @@
* *
* Definitions for the video controller module. * 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/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -147,7 +147,7 @@ typedef struct {
typedef struct { typedef struct {
int w, h; int w, h;
uint8_t *dat; uint8_t *dat;
uint8_t *line[]; uint8_t *line[2048];
} bitmap_t; } bitmap_t;
typedef struct { typedef struct {

4
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Win32 (MinGW32) environment. # 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> # Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -404,7 +404,7 @@ endif
CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \ CFLAGS := $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
$(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \ $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
-fno-strict-aliasing -fno-strict-aliasing
CFLAGS := $(CFLAGS) CXXFLAGS := $(CFLAGS)
######################################################################### #########################################################################

4
src/win/win_ddraw.cpp
View File

@@ -11,7 +11,7 @@
* NOTES: This code should be re-merged into a single init() with a * NOTES: This code should be re-merged into a single init() with a
* 'fullscreen' argument, indicating FS mode is requested. * '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/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * 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; int i, j;
uint8_t *r, *b; uint8_t *r, *b;
uint32_t *rgb = (uint32_t *) bgra;
if (video_grayscale || invert_display) if (video_grayscale || invert_display)
*bgra = video_color_transform(*bgra); *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; POINT po;
HRESULT hr; HRESULT hr;
int yy; int yy;
uint32_t *p, *q;
if (lpdds_back == NULL) { if (lpdds_back == NULL) {
video_blit_complete(); video_blit_complete();