From f269b18bfc35d4e9faabe892e0aae6f1be16219b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Apr 2014 15:22:58 +0200 Subject: [PATCH] (Mednafen VB) MSVC 2003 Xbox 1 build fix --- mednafen/hw_cpu/v810/v810_cpu.cpp | 7 ++++--- mednafen/vb-09333/vip.cpp | 5 +++-- msvc/vb/msvc-2003-xbox1/msvc-2003-xbox1.vcproj | 10 +++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mednafen/hw_cpu/v810/v810_cpu.cpp b/mednafen/hw_cpu/v810/v810_cpu.cpp index 097c012..b243284 100644 --- a/mednafen/hw_cpu/v810/v810_cpu.cpp +++ b/mednafen/hw_cpu/v810/v810_cpu.cpp @@ -600,8 +600,8 @@ INLINE uint32 V810::GetSREG(unsigned int which) // Define accurate mode defines #define RB_GETPC() PC -#define RB_RDOP(PC_offset, ...) RDOP(timestamp, PC + PC_offset, ## __VA_ARGS__) - +//#define RB_RDOP(PC_offset, ...) RDOP(timestamp, PC + PC_offset, ## __VA_ARGS__) +#define RB_RDOP(PC_offset) RDOP(timestamp, PC + PC_offset) void V810::Run_Accurate(int32 MDFN_FASTCALL (*event_handler)(const v810_timestamp_t timestamp)) { @@ -655,7 +655,8 @@ void V810::Run_Accurate_Debug(int32 MDFN_FASTCALL (*event_handler)(const v810_ti // #define RB_GETPC() ((uint32)(PC_ptr - PC_base)) -#define RB_RDOP(PC_offset, ...) LoadU16_LE((uint16 *)&PC_ptr[PC_offset]) +//#define RB_RDOP(PC_offset, ...) LoadU16_LE((uint16 *)&PC_ptr[PC_offset]) +#define RB_RDOP(PC_offset, b) LoadU16_LE((uint16 *)&PC_ptr[PC_offset]) void V810::Run_Fast(int32 MDFN_FASTCALL (*event_handler)(const v810_timestamp_t timestamp)) { diff --git a/mednafen/vb-09333/vip.cpp b/mednafen/vb-09333/vip.cpp index 6b7ae08..4e95fc0 100644 --- a/mednafen/vb-09333/vip.cpp +++ b/mednafen/vb-09333/vip.cpp @@ -19,8 +19,9 @@ #include "vip.h" #include -#define VIP_DBGMSG(format, ...) { } -//#define VIP_DBGMSG(format, ...) printf(format "\n", ## __VA_ARGS__) +static inline void VIP_DBGMSG(const char *format, ...) +{ +} namespace MDFN_IEN_VB { diff --git a/msvc/vb/msvc-2003-xbox1/msvc-2003-xbox1.vcproj b/msvc/vb/msvc-2003-xbox1/msvc-2003-xbox1.vcproj index 1701053..e8a7dc6 100644 --- a/msvc/vb/msvc-2003-xbox1/msvc-2003-xbox1.vcproj +++ b/msvc/vb/msvc-2003-xbox1/msvc-2003-xbox1.vcproj @@ -21,7 +21,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1";"$(SolutionDir)\..\..\";"$(SolutionDir)\..\..\mednafen";"$(SolutionDir)\..\..\mednafen\include";"$(SolutionDir)\..\..\mednafen\cdrom";"$(SolutionDir)\..\..\mednafen\sound";"$(SolutionDir)\..\..\mednafen\pce_fast";"$(SolutionDir)\..\..\mednafen\hw_cpu";"$(SolutionDir)\..\..\mednafen\include\blip";"$(SolutionDir)\..\..\mednafen\hw_sound";"$(SolutionDir)\..\..\mednafen\hw_misc"" - PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN" + PreprocessorDefinitions="_DEBUG;_XBOX;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN;WANT_NEW_API" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -55,7 +55,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1";"$(SolutionDir)\..\..\";"$(SolutionDir)\..\..\mednafen";"$(SolutionDir)\..\..\mednafen\include";"$(SolutionDir)\..\..\mednafen\cdrom";"$(SolutionDir)\..\..\mednafen\sound";"$(SolutionDir)\..\..\mednafen\pce_fast";"$(SolutionDir)\..\..\mednafen\hw_cpu";"$(SolutionDir)\..\..\mednafen\include\blip";"$(SolutionDir)\..\..\mednafen\hw_sound";"$(SolutionDir)\..\..\mednafen\hw_misc"" - PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN" + PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN;WANT_NEW_API" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -90,7 +90,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1";"$(SolutionDir)\..\..\";"$(SolutionDir)\..\..\mednafen";"$(SolutionDir)\..\..\mednafen\include";"$(SolutionDir)\..\..\mednafen\cdrom";"$(SolutionDir)\..\..\mednafen\sound";"$(SolutionDir)\..\..\mednafen\pce_fast";"$(SolutionDir)\..\..\mednafen\hw_cpu";"$(SolutionDir)\..\..\mednafen\include\blip";"$(SolutionDir)\..\..\mednafen\hw_sound";"$(SolutionDir)\..\..\mednafen\hw_misc"" - PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN" + PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN;WANT_NEW_API" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -126,7 +126,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1";"$(SolutionDir)\..\..\";"$(SolutionDir)\..\..\mednafen";"$(SolutionDir)\..\..\mednafen\include";"$(SolutionDir)\..\..\mednafen\cdrom";"$(SolutionDir)\..\..\mednafen\sound";"$(SolutionDir)\..\..\mednafen\pce_fast";"$(SolutionDir)\..\..\mednafen\hw_cpu";"$(SolutionDir)\..\..\mednafen\include\blip";"$(SolutionDir)\..\..\mednafen\hw_sound";"$(SolutionDir)\..\..\mednafen\hw_misc"" - PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN" + PreprocessorDefinitions="NDEBUG;_XBOX;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN;WANT_NEW_API" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE" @@ -162,7 +162,7 @@ OmitFramePointers="TRUE" OptimizeForProcessor="2" AdditionalIncludeDirectories=""$(SolutionDir)\msvc-2003-xbox1";"$(SolutionDir)\..\..\";"$(SolutionDir)\..\..\mednafen";"$(SolutionDir)\..\..\mednafen\include";"$(SolutionDir)\..\..\mednafen\cdrom";"$(SolutionDir)\..\..\mednafen\sound";"$(SolutionDir)\..\..\mednafen\pce_fast";"$(SolutionDir)\..\..\mednafen\hw_cpu";"$(SolutionDir)\..\..\mednafen\include\blip";"$(SolutionDir)\..\..\mednafen\hw_sound";"$(SolutionDir)\..\..\mednafen\hw_misc"" - PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN" + PreprocessorDefinitions="NDEBUG;_XBOX;LTCG;_LIB;WANT_VB_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.28;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;MEDNAFEN_VERSION_NUMERIC=926;WANT_CRC32;LSB_FIRST;BYTE_ORDER=LITTLE_ENDIAN;WANT_NEW_API" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="TRUE"