fixes for building with visual studio 11 beta.

This commit is contained in:
smf- 2012-05-10 19:02:23 +00:00
parent 3c80df9623
commit a7229679c7
4 changed files with 3 additions and 8 deletions

View File

@ -38,8 +38,7 @@
#include <string.h> /* for memset/memcpy() */ #include <string.h> /* for memset/memcpy() */
#include <sys/stat.h> /* for stat() */ #include <sys/stat.h> /* for stat() */
#include <sys/types.h> /* for off_t */ #include <sys/types.h> /* for off_t */
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */
#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
#ifndef fseeko #ifndef fseeko
#define fseeko fseek #define fseeko fseek
#endif #endif
@ -47,7 +46,6 @@
#define ftello ftell #define ftello ftell
#endif #endif
#endif #endif
#endif
#include "flac/assert.h" #include "flac/assert.h"
#include "share/alloc.h" #include "share/alloc.h"
#include "protected/stream_decoder.h" #include "protected/stream_decoder.h"

View File

@ -38,8 +38,7 @@
#include <stdlib.h> /* for malloc() */ #include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy() */ #include <string.h> /* for memcpy() */
#include <sys/types.h> /* for off_t */ #include <sys/types.h> /* for off_t */
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */
#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
#ifndef fseeko #ifndef fseeko
#define fseeko fseek #define fseeko fseek
#endif #endif
@ -47,7 +46,6 @@
#define ftello ftell #define ftello ftell
#endif #endif
#endif #endif
#endif
#include "flac/assert.h" #include "flac/assert.h"
#include "flac/stream_decoder.h" #include "flac/stream_decoder.h"
#include "share/alloc.h" #include "share/alloc.h"

View File

@ -39,9 +39,7 @@
// //
//============================================================ //============================================================
#define NOWINRES
#include "windows.h" #include "windows.h"
#include "commctrl.h"
#include "mamevers.rc" #include "mamevers.rc"
1 24 MOVEABLE PURE "mame.man" 1 24 MOVEABLE PURE "mame.man"

View File

@ -141,6 +141,7 @@ static const translation_info ld_translate[] =
{ 0, "-mwindows", "/subsystem:windows" }, { 0, "-mwindows", "/subsystem:windows" },
{ 0, "-municode", "" }, { 0, "-municode", "" },
{ 0, "-static-libgcc", "" }, { 0, "-static-libgcc", "" },
{ 0, "-static-libstdc++", "" },
{ 0, "-shared", "/dll" }, { 0, "-shared", "/dll" },
{ 0 } { 0 }
}; };