ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

psx - build with vs2015, so we can pass mednafen's internal integrity checks, and force a widespread test of vs2015-built unmanaged dlls

This commit is contained in:
zeromus 2015-07-12 18:48:39 -05:00
parent a354473237
commit ae22972e25
10 changed files with 1432 additions and 6 deletions

BIN
output/dll/octoshock.dll
View File

Binary file not shown.

8
psx/octoshock/bizhawk/octoshock.vcxproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -46,6 +46,7 @@
<ClCompile Include="..\psx\spu.cpp" />
<ClCompile Include="..\psx\timer.cpp" />
<ClCompile Include="..\Stream.cpp" />
<ClCompile Include="..\tests.cpp" />
<ClCompile Include="..\video\Deinterlacer.cpp" />
<ClCompile Include="..\video\surface.cpp" />
</ItemGroup>
@ -101,18 +102,21 @@
<ProjectGuid>{5F35CAFC-6208-4FBE-AD17-0E69BA3F70EC}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>octoshock</RootNamespace>
<TargetPlatformVersion>8.1</TargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -145,6 +149,7 @@
</PrecompiledHeaderOutputFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -165,6 +170,7 @@
</PrecompiledHeaderOutputFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../emuware/msvc;..</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>

1
psx/octoshock/bizhawk/octoshock.vcxproj.filters
View File

@ -114,6 +114,7 @@
<ClCompile Include="..\cdrom\CDUtility.cpp">
<Filter>cdrom</Filter>
</ClCompile>
<ClCompile Include="..\tests.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\psx\cdc.h">

18
psx/octoshock/emuware/emuware.h
View File

@ -5,6 +5,12 @@
#include <cstdlib>
#ifdef _MSC_VER
#define SIZEOF_CHAR sizeof(char)
#define SIZEOF_SHORT sizeof(short)
#define SIZEOF_INT sizeof(int)
#define SIZEOF_LONG sizeof(long)
#define SIZEOF_LONG_LONG sizeof(long long)
#define SIZEOF_OFF_T sizeof(void*)
typedef __int64 s64;
typedef __int32 s32;
typedef __int16 s16;
@ -42,8 +48,6 @@ typedef __uint16_t uint16;
typedef __uint8_t uint8;
#endif
#define final
#define noexcept
//#if MDFN_GCC_VERSION >= MDFN_MAKE_GCCV(4,7,0)
// #define MDFN_ASSUME_ALIGNED(p, align) __builtin_assume_aligned((p), (align))
@ -78,11 +82,17 @@ typedef __uint8_t uint8;
#define UNALIGNED
#endif
#ifdef _MSC_VER
#if defined(_MSC_VER)
#define strncasecmp _strnicmp
#define NO_CLONE
#endif
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
#define final
#define noexcept
#endif
#define TRUE_1 1

2
psx/octoshock/psx/FastFIFO.h
View File

@ -1,6 +1,8 @@
#ifndef __MDFN_FASTFIFO_H
#define __MDFN_FASTFIFO_H
#include "emuware/EW_state.h"
// size should be a power of 2.
template<typename T, size_t size>
class FastFIFO

2
psx/octoshock/psx/gpu_polygon.cpp
View File

@ -15,7 +15,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _MSC_VER
#pragma GCC optimize ("no-unroll-loops,no-peel-loops")
#endif
#include "psx.h"
#include "gpu.h"

1
psx/octoshock/psx/psx.cpp
View File

@ -25,6 +25,7 @@
#include "Stream.h"
#include "spu.h"
#include "error.h"
#include "tests.h"
#include "endian.h"
#include "emuware/EW_state.h"

4
psx/octoshock/test/miniclient/miniclient.vcxproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

1395
psx/octoshock/tests.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

7
psx/octoshock/tests.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef __MDFN_TESTS_H
#define __MDFN_TESTS_H
bool MDFN_RunMathTests(void);
#endif