Fix Win32 MSVC 2010 build.

This commit is contained in:
Themaister 2013-02-09 10:36:39 +01:00
parent 604d27f4db
commit 4e1387ce25
7 changed files with 85 additions and 51 deletions

View File

@ -29,6 +29,10 @@
#undef NEED_DYNAMIC
#endif
#ifdef __cplusplus
extern "C" {
#endif
void init_libretro_sym(void);
void uninit_libretro_sym(void);
@ -78,5 +82,9 @@ extern unsigned (*pretro_get_region)(void);
extern void *(*pretro_get_memory_data)(unsigned);
extern size_t (*pretro_get_memory_size)(unsigned);
#ifdef __cplusplus
}
#endif
#endif

View File

@ -95,6 +95,10 @@
#include "audio/resampler.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MAX_PLAYERS 8
enum dpad_emu_enums
@ -652,6 +656,10 @@ extern struct settings g_settings;
extern struct global g_extern;
/////////
#ifdef __cplusplus
}
#endif
#include "retroarch_logger.h"
#ifndef max

View File

@ -23,6 +23,10 @@
#include "../../config.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
bool rpng_load_image_argb(const char *path, uint32_t **data, unsigned *width, unsigned *height);
#ifdef HAVE_ZLIB_DEFLATE
@ -32,5 +36,9 @@ bool rpng_save_image_bgr24(const char *path, const uint8_t *data,
unsigned width, unsigned height, unsigned pitch);
#endif
#ifdef __cplusplus
}
#endif
#endif

1
hash.h
View File

@ -19,6 +19,7 @@
#include <stdint.h>
#include <stddef.h>
#include "msvc/msvc_compat.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

View File

@ -64,23 +64,23 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<IncludePath>$(DXSDK_DIR)Include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
<IncludePath>$(DXSDK_DIR)Include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<IncludePath>$(DXSDK_DIR)Include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
<IncludePath>$(DXSDK_DIR)Include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -88,10 +88,11 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;CPU_X86</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_ZLIB;WANT_RZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;CPU_X86</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -106,10 +107,11 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_ZLIB;WANT_RZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -126,10 +128,11 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;CPU_X86</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;HAVE_ZLIB;WANT_RZLIB;HAVE_SINC;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS;CPU_X86</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -148,10 +151,11 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;HAVE_WIN32_D3D9;HAVE_CG;HAVE_GLSL;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_SCREENSHOTS;HAVE_BSV_MOVIE;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_SINC;HAVE_ZLIB;WANT_RZLIB;PACKAGE_VERSION="0.9.8";_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;$(CG_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -165,30 +169,29 @@
<ItemGroup>
<ClCompile Include="..\..\audio\dsound.c">
</ClCompile>
<ClCompile Include="..\..\audio\ext_audio.c">
</ClCompile>
<ClCompile Include="..\..\audio\null.c">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\audio\hermite.c" />
<ClCompile Include="..\..\audio\resampler.c" />
<ClCompile Include="..\..\audio\sinc.c" />
<ClCompile Include="..\..\audio\utils.c">
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp" />
<ClCompile Include="..\..\audio\xaudio.c">
</ClCompile>
<ClCompile Include="..\..\autosave.c">
</ClCompile>
<ClCompile Include="..\..\cheats.c" />
<ClCompile Include="..\..\compat\rxml\rxml.c" />
<ClCompile Include="..\..\deps\rzlib\rzlib.c" />
<ClCompile Include="..\..\file_extract.c" />
<ClCompile Include="..\..\gfx\d3d9\d3d9.cpp" />
<ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
<ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
<ClCompile Include="..\..\gfx\fonts\fonts.c" />
<ClCompile Include="..\..\gfx\fonts\gl_font.c" />
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c" />
<ClCompile Include="..\..\gfx\rpng\rpng.c" />
<ClCompile Include="..\..\gfx\shader_cg.c" />
<ClCompile Include="..\..\gfx\shader_glsl.c" />
<ClCompile Include="..\..\performance.c">
</ClCompile>
<ClCompile Include="..\..\command.c">
@ -209,8 +212,6 @@
</ClCompile>
<ClCompile Include="..\..\gfx\context\wgl_ctx.c">
</ClCompile>
<ClCompile Include="..\..\gfx\ext_gfx.c">
</ClCompile>
<ClCompile Include="..\..\gfx\gfx_common.c">
</ClCompile>
<ClCompile Include="..\..\gfx\gfx_context.c">
@ -223,8 +224,6 @@
</ClCompile>
<ClCompile Include="..\..\gfx\math\matrix_3x3.c">
</ClCompile>
<ClCompile Include="..\..\gfx\null.c">
</ClCompile>
<ClCompile Include="..\..\gfx\scaler\filter.c">
</ClCompile>
<ClCompile Include="..\..\gfx\scaler\pixconv.c">
@ -241,12 +240,6 @@
</ClCompile>
<ClCompile Include="..\..\input\input_common.c">
</ClCompile>
<ClCompile Include="..\..\input\null.c">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nullinput.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nullinput.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nullinput.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nullinput.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\message.c">
</ClCompile>
<ClCompile Include="..\..\movie.c">
@ -275,4 +268,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -43,6 +43,12 @@
<Filter Include="Source Files\gfx\d3d9">
<UniqueIdentifier>{ae4f70af-fc87-4c8d-84a5-b2c4cd57e722}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\deps">
<UniqueIdentifier>{a1975595-d469-4d96-81bf-d6a4f0be32f5}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\gfx\rpng">
<UniqueIdentifier>{a1302353-aa00-4f85-a62f-3c40160a5fa3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\autosave.c">
@ -102,12 +108,6 @@
<ClCompile Include="..\..\audio\dsound.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\ext_audio.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\null.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\utils.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
@ -117,9 +117,6 @@
<ClCompile Include="..\..\gfx\context\wgl_ctx.c">
<Filter>Source Files\gfx\context</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\ext_gfx.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\gfx_common.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
@ -132,9 +129,6 @@
<ClCompile Include="..\..\gfx\image.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\null.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\state_tracker.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
@ -144,9 +138,6 @@
<ClCompile Include="..\..\input\input_common.c">
<Filter>Source Files\input</Filter>
</ClCompile>
<ClCompile Include="..\..\input\null.c">
<Filter>Source Files\input</Filter>
</ClCompile>
<ClCompile Include="..\..\conf\config_file.c">
<Filter>Source Files\conf</Filter>
</ClCompile>
@ -171,9 +162,6 @@
<ClCompile Include="..\..\gfx\math\matrix_3x3.c">
<Filter>Source Files\gfx\math</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\d3d9\d3d9.cpp">
<Filter>Source Files\gfx\d3d9</Filter>
</ClCompile>
@ -198,6 +186,33 @@
<ClCompile Include="..\..\gfx\fonts\fonts.c">
<Filter>Source Files\gfx\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\compat\rxml\rxml.c">
<Filter>Source Files\compat</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\resampler.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\hermite.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\cheats.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\shader_glsl.c">
<Filter>Source Files\gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\deps\rzlib\rzlib.c">
<Filter>Source Files\deps</Filter>
</ClCompile>
<ClCompile Include="..\..\file_extract.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\rpng\rpng.c">
<Filter>Source Files\gfx\rpng</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">

View File

@ -33,6 +33,7 @@
#include "screenshot.h"
#include "cheats.h"
#include "compat/getopt_rarch.h"
#include "compat/posix_string.h"
#if defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN