folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Visual Studio Projects: Added support for building under Visual Studio Community (2015)

Browse source 
Release build binaries built under Visual Studio Community DO NOT run on Windows XP.

Fix: #233
This commit is contained in:
Mark Pizzolato 2015-08-19 11:16:47 -07:00
parent 77152c6e20
commit 15736aeec3
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PDP18B/pdp18b_fpp.c
View file

@ -139,6 +139,7 @@ static int32 fir; /* instruction */
static int32 jea; /* exc address */ static int32 jea; /* exc address */
static int32 fguard; /* guard bit */ static int32 fguard; /* guard bit */
static int32 stop_fpp = STOP_RSRV; /* stop if fp dis */ static int32 stop_fpp = STOP_RSRV; /* stop if fp dis */
#define fma fma_X /* Avoid name conflict with math.h defined fma() routine */
static UFP fma; /* FMA */ static UFP fma; /* FMA */
static UFP fmb; /* FMB */ static UFP fmb; /* FMB */
static UFP fmq; /* FMQ - hi,lo only */ static UFP fmq; /* FMQ - hi,lo only */

2
Visual Studio Projects/Pre-Build-Event.cmd
View file

@ -88,6 +88,8 @@ if exist ../../windows-build-windows-build goto _notice3
:_check_files :_check_files
if not exist ../../windows-build/winpcap/Wpdpack/Include/pcap.h goto _notice1 if not exist ../../windows-build/winpcap/Wpdpack/Include/pcap.h goto _notice1
if not exist ../../windows-build/pthreads/pthread.h goto _notice1 if not exist ../../windows-build/pthreads/pthread.h goto _notice1
findstr "/c:_MSC_VER >= 1900" ..\..\windows-build\pthreads\pthread.h >NUL
if ERRORLEVEL 1 goto _notice2
if "%_X_LIBSDL%" == "" goto _done_libsdl if "%_X_LIBSDL%" == "" goto _done_libsdl
if not exist ../../windows-build/libSDL/SDL2-2.0.3/include/SDL.h goto _notice2 if not exist ../../windows-build/libSDL/SDL2-2.0.3/include/SDL.h goto _notice2
if not exist "../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)/Lib/x86/dxguid.lib" goto _notice2 if not exist "../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)/Lib/x86/dxguid.lib" goto _notice2

2
sigma/sigma_cpu.c
View file

@ -2724,7 +2724,7 @@ if (cptr) {
else dlnt = 2; else dlnt = 2;
bpa = ad << val; bpa = ad << val;
if (virt && map_reloc (bpa, VNT, &bpa)) if (virt && map_reloc (bpa, VNT, &bpa))
fprintf (of, "Virtual address %-X: memory management error\n"); fprintf (of, "Virtual address %-X: memory management error\n", ad);
else fprintf (of, "%s %s %-X: physical %s %-X\n", else fprintf (of, "%s %s %-X: physical %s %-X\n",
((virt)? "Virtual": "Physical"), lnt_str[val], ad, lnt_str[dlnt], bpa >> dlnt); ((virt)? "Virtual": "Physical"), lnt_str[val], ad, lnt_str[dlnt], bpa >> dlnt);
return SCPE_OK; return SCPE_OK;

10
sim_timer.h
View file

@ -45,6 +45,12 @@
#if !defined(CLOCK_REALTIME) && !defined(__hpux) #if !defined(CLOCK_REALTIME) && !defined(__hpux)
#define CLOCK_REALTIME 1 #define CLOCK_REALTIME 1
#define NEED_CLOCK_GETTIME 1 #define NEED_CLOCK_GETTIME 1
#if defined(_MSC_VER) /* Visual Studio/Visual C++ */
#if _MSC_VER >= 1900 /* Visual Studio Community (2015) */
#define HAVE_STRUCT_TIMESPEC 1
#define _TIMESPEC_DEFINED 1
#endif /* _MSC_VER >= 1900 */
#endif /* defined(_MSC_VER) */
#if !defined(HAVE_STRUCT_TIMESPEC) #if !defined(HAVE_STRUCT_TIMESPEC)
#define HAVE_STRUCT_TIMESPEC 1 #define HAVE_STRUCT_TIMESPEC 1
#if !defined(_TIMESPEC_DEFINED) #if !defined(_TIMESPEC_DEFINED)
@ -53,8 +59,8 @@ struct timespec {
long tv_sec; long tv_sec;
long tv_nsec; long tv_nsec;
}; };
#endif /* _TIMESPEC_DEFINED */ #endif /* !defined(_TIMESPEC_DEFINED) */
#endif /* HAVE_STRUCT_TIMESPEC */ #endif /* !defined(HAVE_STRUCT_TIMESPEC) */
int clock_gettime(int clock_id, struct timespec *tp); int clock_gettime(int clock_id, struct timespec *tp);
#endif #endif