From 0405132b25f00a10798fc0d33ca348e249ae4f94 Mon Sep 17 00:00:00 2001
From: Tim Hughes <tim@twistedfury.com>
Date: Thu, 1 May 2014 22:36:14 +0100
Subject: [PATCH] Updated for VS2013.

---
 alethzero/MainWin.cpp               | 10 ----------
 libqethereum/QEthereum.cpp          |  4 +++-
 libqethereum/QEthereum.h            |  2 +-
 windows/LibEthereum.vcxproj         |  5 +++++
 windows/LibEthereum.vcxproj.filters |  5 +++++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 4559646cf..89ed66e07 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -1027,14 +1027,4 @@ void Main::updateDebugger()
 #include\
 "moc_MainWin.cpp"
 
-// specify library dependencies, it's easier to do here than in the project since we can control the "d" debug suffix
-#ifdef _DEBUG
-#define QTLIB(x) x"d.lib"
-#else 
-#define QTLIB(x) x".lib"
-#endif
-
-#pragma comment(lib, QTLIB("Qt5Webkit"))
-#pragma comment(lib, QTLIB("Qt5WebkitWidgets"))
-
 #endif
diff --git a/libqethereum/QEthereum.cpp b/libqethereum/QEthereum.cpp
index 8b5490770..e79ebd90e 100644
--- a/libqethereum/QEthereum.cpp
+++ b/libqethereum/QEthereum.cpp
@@ -404,7 +404,9 @@ void QEthereum::doTransact(QString _secret, QString _amount, QString _dest, QStr
 #pragma comment(lib, QTLIB("Qt5PlatformSupport"))
 #pragma comment(lib, QTLIB("Qt5Core"))
 #pragma comment(lib, QTLIB("Qt5GUI"))
-#pragma comment(lib, QTLIB("Qt5Widgets"))
 #pragma comment(lib, QTLIB("Qt5Network"))
+#pragma comment(lib, QTLIB("Qt5Webkit"))
+#pragma comment(lib, QTLIB("Qt5WebkitWidgets"))
+#pragma comment(lib, QTLIB("Qt5Widgets"))
 
 #endif
diff --git a/libqethereum/QEthereum.h b/libqethereum/QEthereum.h
index 5b79dbc88..a637e3d2a 100644
--- a/libqethereum/QEthereum.h
+++ b/libqethereum/QEthereum.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QtCore/QAbstractListModel>
-#include <QtQml>
+#include <QtQml/QtQml>
 #include <libethereum/CommonEth.h>
 #include <libethcore/CommonIO.h>
 
diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj
index 8c8bbc2cc..b392b4447 100644
--- a/windows/LibEthereum.vcxproj
+++ b/windows/LibEthereum.vcxproj
@@ -26,6 +26,9 @@
     <ClCompile Include="..\libethereum\CommonEth.cpp" />
     <ClCompile Include="..\libethereum\Dagger.cpp" />
     <ClCompile Include="..\libethereum\Defaults.cpp" />
+    <ClCompile Include="..\libethereum\Executive.cpp" />
+    <ClCompile Include="..\libethereum\ExtVM.cpp" />
+    <ClCompile Include="..\libethereum\ExtVMFace.cpp" />
     <ClCompile Include="..\libethereum\FeeStructure.cpp" />
     <ClCompile Include="..\libethereum\Instruction.cpp" />
     <ClCompile Include="..\libethereum\PeerNetwork.cpp" />
@@ -52,6 +55,8 @@
     <ClInclude Include="..\libethereum\Dagger.h" />
     <ClInclude Include="..\libethereum\Defaults.h" />
     <ClInclude Include="..\libethereum\Exceptions.h" />
+    <ClInclude Include="..\libethereum\Executive.h" />
+    <ClInclude Include="..\libethereum\ExtVM.h" />
     <ClInclude Include="..\libethereum\ExtVMFace.h" />
     <ClInclude Include="..\libethereum\FeeStructure.h" />
     <ClInclude Include="..\libethereum\Instruction.h" />
diff --git a/windows/LibEthereum.vcxproj.filters b/windows/LibEthereum.vcxproj.filters
index 6cd7427bf..ee7a14460 100644
--- a/windows/LibEthereum.vcxproj.filters
+++ b/windows/LibEthereum.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClCompile Include="..\libethereum\Transaction.cpp" />
     <ClCompile Include="..\libethereum\TransactionQueue.cpp" />
     <ClCompile Include="..\libethereum\VM.cpp" />
+    <ClCompile Include="..\libethereum\Executive.cpp" />
+    <ClCompile Include="..\libethereum\ExtVM.cpp" />
+    <ClCompile Include="..\libethereum\ExtVMFace.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -43,6 +46,8 @@
     <ClInclude Include="..\libethereum\Transaction.h" />
     <ClInclude Include="..\libethereum\TransactionQueue.h" />
     <ClInclude Include="..\libethereum\VM.h" />
+    <ClInclude Include="..\libethereum\Executive.h" />
+    <ClInclude Include="..\libethereum\ExtVM.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Windows">