Allow makefile build with VC2005 (trunk only)

This commit is contained in:
nethack.allison
2006-06-25 22:40:58 +00:00
parent d09c374239
commit 174b985267
7 changed files with 238 additions and 130 deletions

View File

@@ -115,6 +115,10 @@
# endif
#endif
#if defined(_WIN32) && !defined(WIN32)
#define WIN32
#endif
#ifdef WIN32
# undef UNIX
# undef MSDOS

View File

@@ -76,6 +76,37 @@
extern void FDECL(interject_assistance, (int,int,genericptr_t,genericptr_t));
extern void FDECL(interject, (int));
/*
*===============================================
* Compiler-specific adjustments
*===============================================
*/
#ifdef _MSC_VER
/* Visual C 8 warning elimination */
# ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
# endif
# ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
# endif
# ifndef _SCL_SECURE_NO_DEPRECATE
#define _SCL_SECURE_NO_DEPRECATE
# endif
# ifndef _CRT_NONSTDC_NO_DEPRECATE
#define _CRT_NONSTDC_NO_DEPRECATE
# endif
#pragma warning(disable:4761) /* integral size mismatch in arg; conv supp*/
# ifdef YYPREFIX
#pragma warning(disable:4102) /* unreferenced label */
# endif
#pragma warning(disable:4996) /* VC8 deprecation warnings */
#pragma warning(disable:4142) /* benign redefinition */
# if 0
#pragma warning(disable:4018) /* signed/unsigned mismatch */
#pragma warning(disable:4305) /* init, conv from 'const int' to 'char' */
# endif
#endif
/* The following is needed for prototypes of certain functions */
#if defined(_MSC_VER)
#include <process.h> /* Provides prototypes of exit(), spawn() */
@@ -105,11 +136,13 @@ extern void FDECL(interject, (int));
# endif
#endif
#define NO_SIGNAL
#define index strchr
#define rindex strrchr
/* Time stuff */
#include <time.h>
#define USE_STDARG
#ifdef RANDOM
/* Use the high quality random number routines. */
@@ -118,7 +151,8 @@ extern void FDECL(interject, (int));
#define Rand() rand()
#endif
#define FCMASK 0660 /* file creation mask */
#include <sys/stat.h>
#define FCMASK (_S_IREAD|_S_IWRITE) /* file creation mask */
#define regularize nt_regularize
#define HLOCK "NHPERM"
@@ -191,17 +225,6 @@ int _RTLENTRY _EXPFUNC read (int __handle, void _FAR *__buf, unsigned __len);
#define Getchar nhgetch
#endif
#ifdef _MSC_VER
#if 0
#pragma warning(disable:4018) /* signed/unsigned mismatch */
#pragma warning(disable:4305) /* init, conv from 'const int' to 'char' */
#endif
#pragma warning(disable:4761) /* integral size mismatch in arg; conv supp*/
#ifdef YYPREFIX
#pragma warning(disable:4102) /* unreferenced label */
#endif
#endif
extern int FDECL(set_win32_option, (const char *, const char *));
#ifdef WIN32CON
#define LEFTBUTTON FROM_LEFT_1ST_BUTTON_PRESSED