MSVC 2003 build compiles again

This commit is contained in:
twinaphex 2014-06-25 01:57:10 +02:00
parent 4989ce55f9
commit ccc649994b
12 changed files with 48 additions and 17 deletions

View File

@ -1,5 +1,5 @@
#include <stdarg.h>
#include <trio/trio.h>
#include "mednafen/include/trio/trio.h"
#include "mednafen/mednafen.h"
#include "mednafen/git.h"
#include "mednafen/general.h"
@ -22,7 +22,7 @@
#include "mednafen/cdrom/CDUtility.h"
#ifdef _MSC_VER
#include "msvc_compat.h"
#include "mednafen/msvc_compat.h"
#endif
static bool old_cdimagecache = false;

View File

@ -19,7 +19,7 @@
#include "mednafen.h"
#include "FileWrapper.h"
#include <trio/trio.h>
#include "include/trio/trio.h"
#include <stdarg.h>
#include <string.h>

View File

@ -17,6 +17,7 @@
#include "../mednafen.h"
#include "../general.h"
#include "../msvc_compat.h"
#include "CDAccess_CCD.h"
#include <limits>

View File

@ -19,7 +19,7 @@
#include "error.h"
#include <string.h>
#include <stdarg.h>
#include <trio/trio.h>
#include "include/trio/trio.h"
#include "../libretro.h"
extern retro_log_printf_t log_cb;

View File

@ -19,7 +19,7 @@
#include <string.h>
#include <ctype.h>
#include <trio/trio.h>
#include "include/trio/trio.h"
#include <errno.h>
#include <vector>

View File

@ -485,7 +485,7 @@ static void DrawBG(const vdc_t *vdc, const uint32 count, uint8 *target)
const uint16 *BAT_Base = &vdc->VRAM[bat_y];
const uint64 *CG_Base = &vdc->bg_tile_cache[0][line_sub];
uint64_t cg_mask = 0xFFFFFFFFFFFFFFFFFFFULL;
uint64_t cg_mask = 0xFFFFFFFFFFFFFFFFULL;
if((vdc->MWR & 0x3) == 0x3)
cg_mask = (vdc->MWR & 0x80) ? 0xCCCCCCCCCCCCCCCCULL : 0x3333333333333333ULL;

View File

@ -1,6 +1,6 @@
// Blip_Buffer 0.4.1. http://www.slack.net/~ant/
#include <blip/Blip_Buffer.h>
#include "../include/blip/Blip_Buffer.h"
#include <assert.h>
#include <climits>

View File

@ -23,6 +23,7 @@
#include "general.h"
#include "state.h"
#include "video.h"
#include "msvc_compat.h"
#define RLSB MDFNSTATE_RLSB //0x80000000

View File

@ -64,7 +64,7 @@
# define TRIO_FUNC_ISINF
# endif
#endif
#include <trio/trionan.h>
#include "../include/trio/trionan.h"
#if defined(TRIO_EMBED_STRING)
# define TRIO_PUBLIC_STRING static
@ -117,7 +117,7 @@
# define TRIO_FUNC_XSTRING_APPEND_CHAR
# endif
#endif
#include <trio/triostr.h>
#include "../include/trio/triostr.h"
/**************************************************************************
*

View File

@ -26,8 +26,8 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <trio/triodef.h>
#include <trio/triostr.h>
#include "../include/trio/triodef.h"
#include "../include/trio/triostr.h"
#if defined(TRIO_FUNC_TO_LONG_DOUBLE)
# define USE_MATH
#endif

View File

@ -194,13 +194,43 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\..\libretro.cpp">
RelativePath="..\..\libretro.cpp">
</File>
<File
RelativePath="..\..\..\scrc32.cpp">
RelativePath="..\..\scrc32.cpp">
</File>
<File
RelativePath="..\..\..\thread.c">
RelativePath="..\..\thread.c">
<FileConfiguration
Name="Debug|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Profile_FastCap|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Release_LTCG|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<Filter
Name="mednafen"
@ -253,9 +283,6 @@
<File
RelativePath="..\..\mednafen\cdrom\audioreader.cpp">
</File>
<File
RelativePath="..\..\mednafen\cdrom\audioreader_opus.cpp">
</File>
<File
RelativePath="..\..\mednafen\cdrom\CDAccess.cpp">
</File>

View File

@ -66,6 +66,8 @@ void scond_signal(scond_t *cond);
#include <psputils.h>
#elif defined(_WIN32) && !defined(_XBOX)
#include <windows.h>
#elif defined(_XBOX)
#include <xtl.h>
#else
#include <time.h>
#endif