diff --git a/audio/dsound.c b/audio/dsound.c
index c5357e070a..6ea93dbb36 100644
--- a/audio/dsound.c
+++ b/audio/dsound.c
@@ -14,6 +14,11 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "dsound" )
+#pragma comment( lib, "dxguid" )
+#endif
+
#ifdef _XBOX
#define DSERR_BUFFERLOST MAKE_DSHRESULT(150)
#define DSERR_INVALIDPARAM E_INVALIDARG
diff --git a/gfx/d3d9/config_file.hpp b/gfx/d3d9/config_file.hpp
index 749d564dd8..15876e52a5 100644
--- a/gfx/d3d9/config_file.hpp
+++ b/gfx/d3d9/config_file.hpp
@@ -30,9 +30,6 @@ class ConfigFile
conf = config_file_new(nullptr);
}
- ConfigFile(const ConfigFile&) = delete;
- void operator=(const ConfigFile&) = delete;
-
operator bool() { return conf; }
ConfigFile& operator=(ConfigFile&& _in)
@@ -168,6 +165,9 @@ class ConfigFile
private:
config_file_t *conf;
std::string path;
+
+ ConfigFile(const ConfigFile&) {};
+ void operator=(const ConfigFile&) {};
};
#endif
diff --git a/gfx/d3d9/d3d9.cpp b/gfx/d3d9/d3d9.cpp
index cf5b43c12c..cb262c270f 100644
--- a/gfx/d3d9/d3d9.cpp
+++ b/gfx/d3d9/d3d9.cpp
@@ -19,6 +19,13 @@
// It is written in C++11 (should be compat with MSVC 2010).
// Might get rewritten in C99 if I have lots of time to burn.
+#ifdef _MSC_VER
+#pragma comment( lib, "d3d9" )
+#pragma comment( lib, "d3dx9" )
+#pragma comment( lib, "cgd3d9" )
+#pragma comment( lib, "dxguid" )
+#endif
+
#include "d3d9.hpp"
#include "render_chain.hpp"
#include "config_file.hpp"
diff --git a/gfx/d3d9/render_chain.cpp b/gfx/d3d9/render_chain.cpp
index 56cb908d7e..40f3b19ced 100644
--- a/gfx/d3d9/render_chain.cpp
+++ b/gfx/d3d9/render_chain.cpp
@@ -696,10 +696,10 @@ void RenderChain::bind_prev(Pass &pass)
for (unsigned i = 0; i < Textures - 1; i++)
{
- std::snprintf(attr_texture, sizeof(attr_texture), "%s.texture", prev_names[i]);
- std::snprintf(attr_input_size, sizeof(attr_input_size), "%s.video_size", prev_names[i]);
- std::snprintf(attr_tex_size, sizeof(attr_tex_size), "%s.texture_size", prev_names[i]);
- std::snprintf(attr_coord, sizeof(attr_coord), "%s.tex_coord", prev_names[i]);
+ snprintf(attr_texture, sizeof(attr_texture), "%s.texture", prev_names[i]);
+ snprintf(attr_input_size, sizeof(attr_input_size), "%s.video_size", prev_names[i]);
+ snprintf(attr_tex_size, sizeof(attr_tex_size), "%s.texture_size", prev_names[i]);
+ snprintf(attr_coord, sizeof(attr_coord), "%s.tex_coord", prev_names[i]);
D3DXVECTOR2 video_size;
video_size.x = prev.last_width[(prev.ptr - (i + 1)) & TexturesMask];
@@ -1002,7 +1002,8 @@ void RenderChain::init_fvf(Pass &pass)
else
{
pass.attrib_map.push_back(index);
- decl[i] = DECL_FVF_TEXCOORD(index, 3, tex_index);
+ D3DVERTEXELEMENT9 elem = DECL_FVF_TEXCOORD(index, 3, tex_index);
+ decl[i] = elem;
// Find next vacant stream.
index++;
diff --git a/gfx/gfx_common.c b/gfx/gfx_common.c
index da1cb4470c..8856eed4ba 100644
--- a/gfx/gfx_common.c
+++ b/gfx/gfx_common.c
@@ -14,6 +14,10 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "winmm" )
+#endif
+
#include "gfx_common.h"
#include "../general.h"
diff --git a/gfx/gl.c b/gfx/gl.c
index 1f0f4b4d08..393319cbeb 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -14,6 +14,10 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "opengl32" )
+#endif
+
#include "../driver.h"
#include "../performance.h"
#include "scaler/scaler.h"
diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c
index 3955bd969c..3b1041939d 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader_cg.c
@@ -13,6 +13,11 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "cg" )
+#pragma comment( lib, "cggl" )
+#endif
+
#include "shader_cg.h"
#include
#include
diff --git a/input/dinput.c b/input/dinput.c
index 06eb7feb2c..38097dfab2 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -13,6 +13,10 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "Dinput8" )
+#endif
+
#undef DIRECTINPUT_VERSION
#define DIRECTINPUT_VERSION 0x0800
#include
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 42e2e044c7..8d621182c4 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -33,7 +33,6 @@
Application
true
NotSet
- v110
Application
@@ -46,7 +45,6 @@
false
true
NotSet
- v110
@@ -98,7 +96,7 @@
Console
true
- opengl32.lib;dsound.lib;Winmm.lib;Dinput8.lib;ws2_32.lib;dxguid.lib;%(AdditionalDependencies)
+ winmm.lib;Dinput8.lib;dxguid.lib;%(AdditionalDependencies)
@@ -107,7 +105,7 @@
Level3
Disabled
- WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_CONFIGFILE;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-beta2";_CRT_SECURE_NO_WARNINGS
+ WIN32;HAVE_WIN32_D3D9;HAVE_CG;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_CONFIGFILE;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-beta2";_CRT_SECURE_NO_WARNINGS
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;%(AdditionalIncludeDirectories)
MultiThreadedDebug
CompileAsCpp
@@ -115,7 +113,7 @@
Console
true
- opengl32.lib;dsound.lib;Winmm.lib;Dinput8.lib;ws2_32.lib;dxguid.lib;%(AdditionalDependencies)
+ winmm.lib;Dinput8.lib;dxguid.lib;%(AdditionalDependencies)
@@ -136,7 +134,7 @@
true
true
true
- opengl32.lib;dsound.lib;Winmm.lib;Dinput8.lib;ws2_32.lib;dxguid.lib;%(AdditionalDependencies)
+ winmm.lib;Dinput8.lib;dxguid.lib;%(AdditionalDependencies)
@@ -147,7 +145,7 @@
MaxSpeed
true
true
- WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_CONFIGFILE;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-beta2";_CRT_SECURE_NO_WARNINGS
+ WIN32;HAVE_WIN32_D3D9;HAVE_CG;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_CONFIGFILE;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-beta2";_CRT_SECURE_NO_WARNINGS
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\;%(AdditionalIncludeDirectories)
MultiThreaded
CompileAsCpp
@@ -157,7 +155,7 @@
true
true
true
- opengl32.lib;dsound.lib;Winmm.lib;Dinput8.lib;ws2_32.lib;dxguid.lib;%(AdditionalDependencies)
+ winmm.lib;Dinput8.lib;dxguid.lib;%(AdditionalDependencies)
@@ -185,6 +183,7 @@
+
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index ae4d9b247f..91e69dfd4f 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -186,6 +186,9 @@
Source Files\gfx\d3d9
+
+ Source Files\gfx
+
diff --git a/netplay.c b/netplay.c
index 912b957f23..4d2dd60ad4 100644
--- a/netplay.c
+++ b/netplay.c
@@ -13,6 +13,10 @@
* If not, see .
*/
+#ifdef _MSC_VER
+#pragma comment( lib, "ws2_32" )
+#endif
+
#include "netplay_compat.h"
#include "netplay.h"
#include "general.h"