diff --git a/README.md b/README.md
index d0b70d6188..9ad8fbb48f 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,16 @@ RPCS3
[![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
[![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master)
[![Coverity Status](https://scan.coverity.com/projects/3960/badge.svg)](https://scan.coverity.com/projects/3960)
-[![Coverage Status](https://coveralls.io/repos/DHrpcs3/rpcs3/badge.svg)](https://coveralls.io/r/DHrpcs3/rpcs3)
+[![Coverage Status](https://coveralls.io/repos/RPCS3/rpcs3/badge.svg)](https://coveralls.io/r/RPCS3/rpcs3)
An open-source PlayStation 3 emulator/debugger written in C++.
-You can find some basic information in the [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).
+You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).
### Development
-If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/DHrpcs3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator.
+If you want to contribute please take a took at the [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/RPCS3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator.
### Dependencies
@@ -21,8 +21,8 @@ If you want to contribute please take a took at the [Coding Style](https://githu
__Windows__
* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
-* [Cmake 3.1.0+](http://www.cmake.org/download/) (add to PATH)
-* [Python 2.7+](https://www.python.org/downloads/) (add to PATH)
+* [Cmake 3.1.0+](http://www.cmake.org/download/) (optional, required only for LLVM build; add to PATH)
+* [Python](https://www.python.org/downloads/) (optional, required only for LLVM build; add to PATH)
__Linux__
* Debian & Ubuntu: `sudo apt-get install libopenal-dev libwxgtk3.0-dev build-essential libglew-dev`
diff --git a/rpcs3-tests/rpcs3-tests.vcxproj b/rpcs3-tests/rpcs3-tests.vcxproj
index d8e156ca44..fd1778c3c9 100644
--- a/rpcs3-tests/rpcs3-tests.vcxproj
+++ b/rpcs3-tests/rpcs3-tests.vcxproj
@@ -65,7 +65,7 @@
Windows
true
$(VCInstallDir)UnitTest\lib;..\OpenAL\libs\Win64;..\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories)
- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;%(AdditionalDependencies)
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -85,7 +85,7 @@
true
true
$(VCInstallDir)UnitTest\lib;..\OpenAL\libs\Win64;..\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories)
- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;%(AdditionalDependencies)
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/rpcs3.sln b/rpcs3.sln
index 2d3cbe8354..fdf33f6943 100644
--- a/rpcs3.sln
+++ b/rpcs3.sln
@@ -609,12 +609,19 @@ Global
{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release|x64.ActiveCfg = Release|x64
{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}.Release|x64.Build.0 = Release|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - LLVM|x64.ActiveCfg = Debug|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - LLVM|x64.Build.0 = Debug|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug - MemLeak|x64.Build.0 = Debug|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug|x64.ActiveCfg = Debug|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Debug|x64.Build.0 = Debug|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Debug|x64.ActiveCfg = Debug|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Debug|x64.Build.0 = Debug|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Release|x64.ActiveCfg = Release|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.DLL Release|x64.Build.0 = Release|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release - LLVM|x64.ActiveCfg = Release|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release - LLVM|x64.Build.0 = Release|x64
{AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release|x64.ActiveCfg = Release|x64
+ {AB222E8A-00CA-4ACF-A87E-5251C16C0587}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj
index a80028c62a..689b7500d3 100644
--- a/rpcs3/D3D12GSRender.vcxproj
+++ b/rpcs3/D3D12GSRender.vcxproj
@@ -58,7 +58,6 @@
true
- d3dcompiler.lib;dxgi.lib;d2d1.lib;dwrite.lib;%(AdditionalDependencies)
diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.cpp b/rpcs3/Emu/Audio/AL/OpenALThread.cpp
index 14fcd2dc5e..7f63ae40bf 100644
--- a/rpcs3/Emu/Audio/AL/OpenALThread.cpp
+++ b/rpcs3/Emu/Audio/AL/OpenALThread.cpp
@@ -5,6 +5,10 @@
#include "OpenALThread.h"
+#ifdef _MSC_VER
+#pragma comment(lib, "OpenAL32.lib")
+#endif
+
ALenum g_last_al_error = AL_NO_ERROR;
ALCenum g_last_alc_error = ALC_NO_ERROR;
diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
index f5ba1a5942..74ed9b1de7 100644
--- a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
+++ b/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
@@ -11,6 +11,10 @@
#define ASMJIT_STATIC
#define ASMJIT_DEBUG
+#ifdef _MSC_VER
+#pragma comment(lib, "asmjit.lib")
+#endif
+
#include "asmjit.h"
#define OFFSET_OF(type, x) static_cast(reinterpret_cast(&(((type*)0)->x)))
diff --git a/rpcs3/Gui/AboutDialog.h b/rpcs3/Gui/AboutDialog.h
index 90943d550b..b8471ed69a 100644
--- a/rpcs3/Gui/AboutDialog.h
+++ b/rpcs3/Gui/AboutDialog.h
@@ -1,88 +1,86 @@
#pragma once
-class AboutDialog
- : public wxDialog
+class AboutDialog : public wxDialog
{
enum
{
+ b_id_github,
b_id_website,
- b_id_forum
+ b_id_forum,
};
public:
- AboutDialog(wxWindow *parent);
+ AboutDialog(wxWindow* parent)
+ : wxDialog(parent, wxID_ANY, "About " _PRGNAME_, wxDefaultPosition)
+ {
+ wxBoxSizer* s_panel(new wxBoxSizer(wxVERTICAL));
- void OpenWebsite(wxCommandEvent& WXUNUSED(event));
- void OpenForum(wxCommandEvent& WXUNUSED(event));
+ //Logo
+ wxPanel* s_panel_logo(new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(512, 92)));
+ s_panel_logo->SetBackgroundColour(wxColor(100, 100, 100));
+
+ wxStaticText* t_name = new wxStaticText(this, wxID_ANY, _PRGNAME_);
+ t_name->SetFont(wxFont(28, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
+ t_name->SetBackgroundColour(wxColor(100, 100, 100));
+ t_name->SetForegroundColour(wxColor(255, 255, 255));
+ t_name->SetPosition(wxPoint(10, 6));
+
+ wxStaticText* t_descr = new wxStaticText(this, wxID_ANY, "An early but promising PS3 emulator and debugger.");
+ t_descr->SetBackgroundColour(wxColor(100, 100, 100));
+ t_descr->SetForegroundColour(wxColor(255, 255, 255));
+ t_descr->SetPosition(wxPoint(12, 50));
+
+ wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format(_PRGNAME_ " Version: " _PRGVER_ "-" RPCS3_GIT_VERSION));
+ t_version->SetBackgroundColour(wxColor(100, 100, 100));
+ t_version->SetForegroundColour(wxColor(200, 200, 200));
+ t_version->SetPosition(wxPoint(12, 66));
+
+ //Credits
+ wxBoxSizer* s_panel_credits(new wxBoxSizer(wxHORIZONTAL));
+ wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea\nHykem\nOil\nNekotekina\nelisha464\nBigpet\nvlj\n");
+ wxStaticText* t_section2 = new wxStaticText(this, wxID_ANY, "\nThanks:\n\nBlackDaemon\nAishou\nkrofna\nxsacha\n");
+
+ s_panel_credits->AddSpacer(12);
+ s_panel_credits->Add(t_section1, 5);
+ s_panel_credits->AddStretchSpacer();
+ s_panel_credits->Add(t_section2, 5);
+ s_panel_credits->AddSpacer(12);
+
+ //Buttons
+ wxBoxSizer* s_panel_buttons(new wxBoxSizer(wxHORIZONTAL));
+ wxButton* b_github = new wxButton(this, b_id_github, "GitHub");
+ wxButton* b_website = new wxButton(this, b_id_website, "Website");
+ wxButton* b_forum = new wxButton(this, b_id_forum, "Forum");
+ Connect(b_id_github, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutDialog::OpenWebsite));
+ Connect(b_id_website, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutDialog::OpenWebsite));
+ Connect(b_id_forum, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutDialog::OpenWebsite));
+
+ s_panel_buttons->AddSpacer(12);
+ s_panel_buttons->Add(b_github, 16, 0, 5);
+ s_panel_buttons->AddStretchSpacer();
+ s_panel_buttons->Add(b_website, 16, 0, 5);
+ s_panel_buttons->AddStretchSpacer();
+ s_panel_buttons->Add(b_forum, 16, 0, 5);
+ s_panel_buttons->AddStretchSpacer(20);
+ s_panel_buttons->Add(new wxButton(this, wxID_OK), 16, 0, 5);
+ s_panel_buttons->AddSpacer(12);
+
+ //Panels
+ s_panel->Add(s_panel_logo);
+ s_panel->Add(s_panel_credits, 0, wxEXPAND);
+ s_panel->Add(s_panel_buttons, 0, wxEXPAND);
+ s_panel->AddSpacer(12);
+
+ SetSizerAndFit(s_panel);
+ }
+
+ void OpenWebsite(wxCommandEvent& event)
+ {
+ switch (event.GetId())
+ {
+ case b_id_github: wxLaunchDefaultBrowser("https://github.com/RPCS3"); break;
+ case b_id_website: wxLaunchDefaultBrowser("http://rpcs3.net/"); break;
+ case b_id_forum: wxLaunchDefaultBrowser("http://www.emunewz.net/forum/forumdisplay.php?fid=162"); break;
+ }
+ }
};
-
-AboutDialog::AboutDialog(wxWindow *parent)
- : wxDialog(parent, wxID_ANY, "About RPCS3", wxDefaultPosition)
-{
- wxBoxSizer* s_panel(new wxBoxSizer(wxVERTICAL));
-
- //Logo
- wxPanel* s_panel_logo(new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(512,92)));
- s_panel_logo->SetBackgroundColour(wxColor(100,100,100));
-
- wxStaticText* t_name = new wxStaticText(this, wxID_ANY, "RPCS3");
- t_name->SetFont(wxFont(28, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
- t_name->SetBackgroundColour(wxColor(100,100,100));
- t_name->SetForegroundColour(wxColor(255,255,255));
- t_name->SetPosition(wxPoint(10,6));
-
- wxStaticText* t_descr = new wxStaticText(this, wxID_ANY, "An early but promising PS3 emulator and debugger.");
- t_descr->SetBackgroundColour(wxColor(100,100,100));
- t_descr->SetForegroundColour(wxColor(255,255,255));
- t_descr->SetPosition(wxPoint(12,50));
-
- wxStaticText* t_version = new wxStaticText(this, wxID_ANY, wxString::Format(_PRGNAME_" Version: " _PRGVER_ "-" RPCS3_GIT_VERSION));
- t_version->SetBackgroundColour(wxColor(100,100,100));
- t_version->SetForegroundColour(wxColor(200,200,200));
- t_version->SetPosition(wxPoint(12,66));
-
- //Credits
- wxBoxSizer* s_panel_credits(new wxBoxSizer(wxHORIZONTAL));
- wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea\nHykem\nOil\nNekotekina\nelisha464\nBigpet\nvlj", wxDefaultPosition, wxSize(156,160));
- wxStaticText* t_section2 = new wxStaticText(this, wxID_ANY, "\nThanks:\n\nBlackDaemon\nAishou\nkrofna\nxsacha", wxDefaultPosition, wxSize(156,160));
-
- s_panel_credits->AddSpacer(12);
- s_panel_credits->Add(t_section1);
- s_panel_credits->AddSpacer(8);
- s_panel_credits->Add(t_section2);
- s_panel_credits->AddSpacer(8);
- s_panel_credits->AddSpacer(12);
-
- //Buttons
- wxBoxSizer* s_panel_buttons(new wxBoxSizer(wxHORIZONTAL));
- wxButton* b_website = new wxButton(this, b_id_website, "Website");
- wxButton* b_forum = new wxButton(this, b_id_forum, "Forum");
- Connect(b_id_website, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutDialog::OpenWebsite));
- Connect(b_id_forum, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AboutDialog::OpenForum));
-
- s_panel_buttons->AddSpacer(12);
- s_panel_buttons->Add(b_website, wxLEFT, 0, 5);
- s_panel_buttons->AddSpacer(5);
- s_panel_buttons->Add(b_forum, wxLEFT, 0, 5);
- s_panel_buttons->AddSpacer(218);
- s_panel_buttons->Add(new wxButton(this, wxID_OK), wxLEFT, 0, 5);
- s_panel_buttons->AddSpacer(12);
-
- //Panels
- s_panel->Add(s_panel_logo);
- s_panel->Add(s_panel_credits);
- s_panel->Add(s_panel_buttons);
- s_panel->AddSpacer(12);
-
- SetSizerAndFit(s_panel);
-}
-
-void AboutDialog::OpenWebsite(wxCommandEvent& WXUNUSED(event))
-{
- wxLaunchDefaultBrowser("http://rpcs3.net/");
-}
-
-void AboutDialog::OpenForum(wxCommandEvent& WXUNUSED(event))
-{
- wxLaunchDefaultBrowser("http://www.emunewz.net/forum/forumdisplay.php?fid=162");
-}
diff --git a/rpcs3/Gui/GSFrame.h b/rpcs3/Gui/GSFrame.h
index 01aeea0130..b39ff860fe 100644
--- a/rpcs3/Gui/GSFrame.h
+++ b/rpcs3/Gui/GSFrame.h
@@ -39,4 +39,4 @@ public:
private:
DECLARE_EVENT_TABLE();
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp
index 4ab8bfb9f1..1591c28f3c 100644
--- a/rpcs3/Gui/SettingsDialog.cpp
+++ b/rpcs3/Gui/SettingsDialog.cpp
@@ -88,7 +88,7 @@ std::vector GetAdapters()
SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
: wxDialog(parent, wxID_ANY, "Settings", wxDefaultPosition)
{
- const bool was_paused = Emu.Pause();
+ const bool was_running = Emu.Pause();
static const u32 width = 458;
static const u32 height = 400;
@@ -541,5 +541,5 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
Ini.Save();
}
- if (was_paused) Emu.Resume();
+ if (was_running) Emu.Resume();
}
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index d2ba8386f6..9fe91157f2 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -130,7 +130,7 @@
true
- wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies)
+ wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
true
..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64
@@ -160,7 +160,7 @@
true
- wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies)
+ wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
true
..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64
@@ -190,7 +190,7 @@
true
- wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies)
+ wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
true
..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\OpenAL\libs\Win64
@@ -229,7 +229,7 @@
true
true
true
- wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies)
+ wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
@@ -267,7 +267,7 @@
true
true
true
- wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;asmjit.lib;%(AdditionalDependencies)
+ wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)
%(IgnoreSpecificDefaultLibraries)
diff --git a/rpcs3/stdafx.cpp b/rpcs3/stdafx.cpp
index fd4f341c7b..1ce5959c46 100644
--- a/rpcs3/stdafx.cpp
+++ b/rpcs3/stdafx.cpp
@@ -1 +1,9 @@
#include "stdafx.h"
+
+#ifdef _MSC_VER
+#pragma comment(lib, "avcodec.lib")
+#pragma comment(lib, "avformat.lib")
+#pragma comment(lib, "avutil.lib")
+#pragma comment(lib, "swresample.lib")
+#pragma comment(lib, "swscale.lib")
+#endif