claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synching VC14 and VC15, fixed some (more) warnings.

Browse Source
This commit is contained in:
waltje
2018-04-25 18:24:37 -04:00
parent 44223a36b4
commit c190810fcf
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvr_at.c
View File

@@ -189,7 +189,7 @@
* including the later update (DS12887A) which implemented a * including the later update (DS12887A) which implemented a
* "century" register to be compatible with Y2K. * "century" register to be compatible with Y2K.
* *
* Version: @(#)nvr_at.c 1.0.5 2018/04/09 * Version: @(#)nvr_at.c 1.0.6 2018/04/25
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -286,7 +286,7 @@ typedef struct {
int8_t stat; int8_t stat;
uint8_t cent; uint8_t cent;
uint16_t addr; uint8_t addr;
int64_t ecount, int64_t ecount,
rtctime; rtctime;

6
src/sound/snd_dbopl.cpp
View File

@@ -10,7 +10,7 @@
* *
* NOTE: See MSC_ macros for allocation on stack. --FvK * NOTE: See MSC_ macros for allocation on stack. --FvK
* *
* Version: @(#)snd_dbopl.cpp 1.0.5 2018/04/10 * Version: @(#)snd_dbopl.cpp 1.0.6 2018/04/25
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -191,7 +191,7 @@ void opl2_update(int nr, int16_t *buffer, int samples)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
static Bit32s *buffer_32 = NULL; static Bit32s *buffer_32 = NULL;
static Bit32s buffer_sz = 0; static Bit32u buffer_sz = 0;
#endif #endif
int c; int c;
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -221,7 +221,7 @@ void opl3_update(int nr, int16_t *buffer, int samples)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
static Bit32s *buffer_32 = NULL; static Bit32s *buffer_32 = NULL;
static Bit32s buffer_sz = 0; static Bit32u buffer_sz = 0;
#endif #endif
int c; int c;
#ifdef _MSC_VER #ifdef _MSC_VER

4
src/win/msvc/Makefile.VC
View File

@@ -8,7 +8,7 @@
# #
# Makefile for Windows using Visual Studio 2015. # Makefile for Windows using Visual Studio 2015.
# #
# Version: @(#)Makefile.VC 1.0.17 2018/04/25 # Version: @(#)Makefile.VC 1.0.18 2018/04/25
# #
# Author: Fred N. van Kempen, <decwiz@yahoo.com> # Author: Fred N. van Kempen, <decwiz@yahoo.com>
# #
@@ -504,7 +504,7 @@ HDDOBJ := hdd.obj \
hdc.obj \ hdc.obj \
hdc_st506_xt.obj hdc_st506_at.obj \ hdc_st506_xt.obj hdc_st506_at.obj \
hdc_esdi_at.obj hdc_esdi_mca.obj \ hdc_esdi_at.obj hdc_esdi_mca.obj \
hdc_ide_ata.obj hdc_ide_xta.o hdc_xtide.obj hdc_ide_ata.obj hdc_ide_xta.obj hdc_xtide.obj
CDROMOBJ := cdrom.obj \ CDROMOBJ := cdrom.obj \
cdrom_dosbox.obj cdrom_image.obj cdrom_null.obj cdrom_dosbox.obj cdrom_image.obj cdrom_null.obj

9
src/win/msvc/vc14/VARCem.vcxproj
View File

@@ -48,9 +48,10 @@
<ClCompile Include="..\..\..\disk\hdc.c" /> <ClCompile Include="..\..\..\disk\hdc.c" />
<ClCompile Include="..\..\..\disk\hdc_esdi_at.c" /> <ClCompile Include="..\..\..\disk\hdc_esdi_at.c" />
<ClCompile Include="..\..\..\disk\hdc_esdi_mca.c" /> <ClCompile Include="..\..\..\disk\hdc_esdi_mca.c" />
<ClCompile Include="..\..\..\disk\hdc_ide.c" /> <ClCompile Include="..\..\..\disk\hdc_ide_ata.c" />
<ClCompile Include="..\..\..\disk\hdc_mfm_at.c" /> <ClCompile Include="..\..\..\disk\hdc_ide_xta.c" />
<ClCompile Include="..\..\..\disk\hdc_mfm_xt.c" /> <ClCompile Include="..\..\..\disk\hdc_st506_at.c" />
<ClCompile Include="..\..\..\disk\hdc_st506_xt.c" />
<ClCompile Include="..\..\..\disk\hdc_xtide.c" /> <ClCompile Include="..\..\..\disk\hdc_xtide.c" />
<ClCompile Include="..\..\..\disk\hdd.c" /> <ClCompile Include="..\..\..\disk\hdd.c" />
<ClCompile Include="..\..\..\disk\hdd_image.c" /> <ClCompile Include="..\..\..\disk\hdd_image.c" />
@@ -108,10 +109,10 @@
<ClCompile Include="..\..\..\machine\m_at_t3100e_vid.c" /> <ClCompile Include="..\..\..\machine\m_at_t3100e_vid.c" />
<ClCompile Include="..\..\..\machine\m_at_wd76c10.c" /> <ClCompile Include="..\..\..\machine\m_at_wd76c10.c" />
<ClCompile Include="..\..\..\machine\m_europc.c" /> <ClCompile Include="..\..\..\machine\m_europc.c" />
<ClCompile Include="..\..\..\machine\m_europc_hdc.c" />
<ClCompile Include="..\..\..\machine\m_olivetti_m24.c" /> <ClCompile Include="..\..\..\machine\m_olivetti_m24.c" />
<ClCompile Include="..\..\..\machine\m_pcjr.c" /> <ClCompile Include="..\..\..\machine\m_pcjr.c" />
<ClCompile Include="..\..\..\machine\m_ps1.c" /> <ClCompile Include="..\..\..\machine\m_ps1.c" />
<ClCompile Include="..\..\..\machine\m_ps1_hdc.c" />
<ClCompile Include="..\..\..\machine\m_ps2_isa.c" /> <ClCompile Include="..\..\..\machine\m_ps2_isa.c" />
<ClCompile Include="..\..\..\machine\m_ps2_mca.c" /> <ClCompile Include="..\..\..\machine\m_ps2_mca.c" />
<ClCompile Include="..\..\..\machine\m_tandy.c" /> <ClCompile Include="..\..\..\machine\m_tandy.c" />

21
src/win/msvc/vc14/VARCem.vcxproj.filters
View File

@@ -116,13 +116,16 @@
<ClCompile Include="..\..\..\disk\hdc_esdi_mca.c"> <ClCompile Include="..\..\..\disk\hdc_esdi_mca.c">
<Filter>disk</Filter> <Filter>disk</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\disk\hdc_ide.c"> <ClCompile Include="..\..\..\disk\hdc_ide_ata.c">
<Filter>disk</Filter> <Filter>disk</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\disk\hdc_mfm_at.c"> <ClCompile Include="..\..\..\disk\hdc_ide_xta.c">
<Filter>disk</Filter> <Filter>disk</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\disk\hdc_mfm_xt.c"> <ClCompile Include="..\..\..\disk\hdc_st506_at.c">
<Filter>disk</Filter>
</ClCompile>
<ClCompile Include="..\..\..\disk\hdc_st506_xt.c">
<Filter>disk</Filter> <Filter>disk</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\disk\hdc_xtide.c"> <ClCompile Include="..\..\..\disk\hdc_xtide.c">
@@ -248,9 +251,6 @@
<ClCompile Include="..\..\..\machine\m_europc.c"> <ClCompile Include="..\..\..\machine\m_europc.c">
<Filter>machine</Filter> <Filter>machine</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\machine\m_europc_hdc.c">
<Filter>machine</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machine\m_olivetti_m24.c"> <ClCompile Include="..\..\..\machine\m_olivetti_m24.c">
<Filter>machine</Filter> <Filter>machine</Filter>
</ClCompile> </ClCompile>
@@ -260,6 +260,9 @@
<ClCompile Include="..\..\..\machine\m_ps1.c"> <ClCompile Include="..\..\..\machine\m_ps1.c">
<Filter>machine</Filter> <Filter>machine</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\machine\m_ps1_hdc.c">
<Filter>machine</Filter>
</ClCompile>
<ClCompile Include="..\..\..\machine\m_ps2_isa.c"> <ClCompile Include="..\..\..\machine\m_ps2_isa.c">
<Filter>machine</Filter> <Filter>machine</Filter>
</ClCompile> </ClCompile>
@@ -665,9 +668,6 @@
<ClCompile Include="..\..\..\video\vid_svga_render.c"> <ClCompile Include="..\..\..\video\vid_svga_render.c">
<Filter>video</Filter> <Filter>video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\video\vid_table.c">
<Filter>video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\video\vid_tgui9440.c"> <ClCompile Include="..\..\..\video\vid_tgui9440.c">
<Filter>video</Filter> <Filter>video</Filter>
</ClCompile> </ClCompile>
@@ -689,6 +689,9 @@
<ClCompile Include="..\..\..\video\vid_wy700.c"> <ClCompile Include="..\..\..\video\vid_wy700.c">
<Filter>video</Filter> <Filter>video</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\video\video_dev.c">
<Filter>video</Filter>
</ClCompile>
<ClCompile Include="..\..\..\video\video.c"> <ClCompile Include="..\..\..\video\video.c">
<Filter>video</Filter> <Filter>video</Filter>
</ClCompile> </ClCompile>

5
src/win/win_d3d.cpp
View File

@@ -8,7 +8,7 @@
* *
* Rendering module for Microsoft Direct3D 9. * Rendering module for Microsoft Direct3D 9.
* *
* Version: @(#)win_d3d.cpp 1.0.7 2018/04/14 * Version: @(#)win_d3d.cpp 1.0.8 2018/04/25
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -45,6 +45,9 @@
#include "../emu.h" #include "../emu.h"
#include "../version.h" #include "../version.h"
#include "../device.h" #include "../device.h"
#ifdef _MSC_VER
# pragma warning(disable: 4200)
#endif
#include "../video/video.h" #include "../video/video.h"
#include "../plat.h" #include "../plat.h"
#include "win.h" #include "win.h"

5
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.4 2018/04/14 * Version: @(#)win_ddraw.cpp 1.0.5 2018/04/25
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -50,6 +50,9 @@
#endif #endif
#include "../emu.h" #include "../emu.h"
#include "../device.h" #include "../device.h"
#ifdef _MSC_VER
# pragma warning(disable: 4200)
#endif
#include "../video/video.h" #include "../video/video.h"
#include "../plat.h" #include "../plat.h"
#include "../ui.h" #include "../ui.h"