From 2764afe26521d6d87dacda759f0308f6d47eb7ee Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Fri, 24 May 2019 01:01:21 +0200
Subject: [PATCH] Fix IDA plugin build (#78)

---
 3rdparty/README.txt                               |  1 +
 PluginGeneric/AttachDialog.cpp                    |  2 +-
 PluginGeneric/OptionsDialog.cpp                   |  6 +++---
 Scylla/scylla.props                               |  4 ++--
 ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp | 14 +++++++-------
 5 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 3rdparty/README.txt

diff --git a/3rdparty/README.txt b/3rdparty/README.txt
new file mode 100644
index 00000000..1dfcc110
--- /dev/null
+++ b/3rdparty/README.txt
@@ -0,0 +1 @@
+To build the IDA plugin, extract the contents of idasdk695.zip in the directory "idasdk"
\ No newline at end of file
diff --git a/PluginGeneric/AttachDialog.cpp b/PluginGeneric/AttachDialog.cpp
index e6108041..f364d42f 100644
--- a/PluginGeneric/AttachDialog.cpp
+++ b/PluginGeneric/AttachDialog.cpp
@@ -9,7 +9,7 @@
 #include <ollydbg2/plugin.h>
 #elif __IDP__
 #include "..\ScyllaHideIDAProPlugin\resource.h"
-#include <idasdk/idp.hpp>
+#include <idp.hpp>
 #elif X64DBG
 #include "..\ScyllaHideX64DBGPlugin\resource.h"
 #endif
diff --git a/PluginGeneric/OptionsDialog.cpp b/PluginGeneric/OptionsDialog.cpp
index ce619226..d819a2d9 100644
--- a/PluginGeneric/OptionsDialog.cpp
+++ b/PluginGeneric/OptionsDialog.cpp
@@ -23,9 +23,9 @@
 
 #elif defined(__IDP__)
 //#define BUILD_IDA_64BIT 1
-#include <idasdk/ida.hpp>
-#include <idasdk/idp.hpp>
-#include <idasdk/dbg.hpp>
+#include <ida.hpp>
+#include <idp.hpp>
+#include <dbg.hpp>
 #include "..\ScyllaHideIDAProPlugin\IdaServerClient.h"
 #include "..\PluginGeneric\AttachDialog.h"
 #include "..\ScyllaHideIDAProPlugin\resource.h"
diff --git a/Scylla/scylla.props b/Scylla/scylla.props
index 42b4294a..b7e426ae 100644
--- a/Scylla/scylla.props
+++ b/Scylla/scylla.props
@@ -12,7 +12,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\idasdk;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\idasdk\include;</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32_NO_STATUS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -26,7 +26,7 @@
       <AdditionalOptions>/Gw /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty;$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\idasdk\lib;$(OutDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>Scylla.lib;ntdll\ntdll_$(PlatformShortName).lib;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)</AdditionalDependencies>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
       <AdditionalOptions>/NOVCFEATURE /NOCOFFGRPINFO %(AdditionalOptions)</AdditionalOptions>
diff --git a/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp b/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp
index e39b1e0e..9bef6d9e 100644
--- a/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp
+++ b/ScyllaHideIDAProPlugin/ScyllaHideIDAProPlugin.cpp
@@ -5,18 +5,18 @@
 //for 64bit - p64
 #ifdef BUILD_IDA_64BIT
 #define __EA64__
-#pragma comment(lib, "idasdk/x86_win_vc_64/ida.lib")
+#pragma comment(lib, "x86_win_vc_64/ida.lib")
 #else
 //for 32bit - plw
-#pragma comment(lib, "idasdk/x86_win_vc_32/ida.lib")
+#pragma comment(lib, "x86_win_vc_32/ida.lib")
 #endif
 
 #include <Windows.h>
-#include <idasdk/ida.hpp>
-#include <idasdk/idp.hpp>
-#include <idasdk/dbg.hpp>
-#include <idasdk/loader.hpp>
-#include <idasdk/kernwin.hpp>
+#include <ida.hpp>
+#include <idp.hpp>
+#include <dbg.hpp>
+#include <loader.hpp>
+#include <kernwin.hpp>
 #include <Scylla/Logger.h>
 #include <Scylla/Settings.h>
 #include <Scylla/Version.h>