From 080e5039541bbceeea65c1643f90d96f125621a3 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Sun, 1 Nov 2015 13:43:30 +0300
Subject: [PATCH] Compilation fix

---
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp      | 4 ----
 rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp | 3 ---
 rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp         | 1 -
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp  | 4 ++--
 rpcs3/stdafx_d3d12.cpp                     | 5 +++++
 rpcs3/stdafx_d3d12.h                       | 3 +++
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
index 3a135b9953..2b4270c4ea 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
@@ -1,6 +1,5 @@
 #include "stdafx_d3d12.h"
 #ifdef _WIN32
-#include <d3dcompiler.h>
 #include "D3D12GSRender.h"
 #include <wrl/client.h>
 #include <dxgi1_4.h>
@@ -10,9 +9,6 @@
 #include <d3d11on12.h>
 #include "Emu/state.h"
 #include "D3D12Formats.h"
-#pragma comment(lib, "d2d1")
-#pragma comment(lib, "DXGI")
-#pragma comment(lib, "Dwrite")
 
 PFN_D3D12_CREATE_DEVICE wrapD3D12CreateDevice;
 PFN_D3D12_GET_DEBUG_INTERFACE wrapD3D12GetDebugInterface;
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
index 2ce50bc6aa..ae80ef0e15 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
@@ -1,13 +1,10 @@
 #include "stdafx_d3d12.h"
 #ifdef _WIN32
-#include <d3dcompiler.h>
 #include "D3D12PipelineState.h"
 #include "D3D12GSRender.h"
 #include "Emu/state.h"
 #include "D3D12Formats.h"
 
-#pragma comment (lib, "d3dcompiler.lib")
-
 #define TO_STRING(x) #x
 
 void Shader::Compile(const std::string &code, SHADER_TYPE st)
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
index e54507c51d..0c18b013bc 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
@@ -3,7 +3,6 @@
 */
 #include "stdafx_d3d12.h"
 #ifdef _WIN32
-#include <d3dcompiler.h>
 #include "D3D12GSRender.h"
 #include "d3dx12.h"
 #include "Utilities/Log.h"
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index f8c7a96baa..9fb90f5509 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -504,8 +504,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr<CellGcmContextData> ctxt, u32
 			return res;
 		}
 	}
-#ifdef __GNUC__
-	//gcc internal compiler error, try to avoid it for now
+#if 1
 	*ctxt->current++ = (GCM_FLIP_COMMAND << 2) | (1 << 18);
 	*ctxt->current++ = id;
 
@@ -514,6 +513,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr<CellGcmContextData> ctxt, u32
 		vm::_ref<CellGcmControl>(gcm_info.control_addr).put += 2 * sizeof(u32);
 	}
 #else
+	// internal compiler error, try to avoid it for now
 	u32 command_size = rsx::make_command(ctxt->current, GCM_FLIP_COMMAND, id);
 
 	if (ctxt.addr() == gcm_info.context_addr)
diff --git a/rpcs3/stdafx_d3d12.cpp b/rpcs3/stdafx_d3d12.cpp
index 6b442dbdbf..65496e782d 100644
--- a/rpcs3/stdafx_d3d12.cpp
+++ b/rpcs3/stdafx_d3d12.cpp
@@ -1 +1,6 @@
 #include "stdafx_d3d12.h"
+
+#pragma comment(lib, "d2d1")
+#pragma comment(lib, "DXGI")
+#pragma comment(lib, "Dwrite")
+#pragma comment(lib, "d3dcompiler.lib")
diff --git a/rpcs3/stdafx_d3d12.h b/rpcs3/stdafx_d3d12.h
index f912db7cd2..324cfbd6ce 100644
--- a/rpcs3/stdafx_d3d12.h
+++ b/rpcs3/stdafx_d3d12.h
@@ -2,6 +2,9 @@
 
 #include "stdafx.h"
 #ifdef _WIN32
+// Must be included first
+#include <d3dcompiler.h>
+
 #include <d3d12.h>
 #include "Emu\RSX\D3D12\D3D12Utils.h"
 #include "Emu\RSX\D3D12\D3D12Formats.h"