From c1c3770cc6ada75606b66b768162eba3c0a51b5e Mon Sep 17 00:00:00 2001
From: Ionel-Cristinel ANICHITEI <ianichitei@bitdefender.com>
Date: Tue, 17 Nov 2020 16:03:16 +0200
Subject: [PATCH] Move bdhsemu.h to inc/

---
 bdshemu/Makefile                | 6 +++---
 bdshemu/bdshemu.c               | 2 +-
 bdshemu/bdshemu.vcxproj         | 2 +-
 bdshemu/bdshemu.vcxproj.filters | 2 +-
 disasmtool/disasmtool.c         | 2 +-
 disasmtool_lix/CMakeLists.txt   | 1 -
 inc/{bdshemu => }/bdshemu.h     | 0
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename inc/{bdshemu => }/bdshemu.h (100%)

diff --git a/bdshemu/Makefile b/bdshemu/Makefile
index 5fe016f..0564447 100644
--- a/bdshemu/Makefile
+++ b/bdshemu/Makefile
@@ -4,7 +4,7 @@ SRC_FILES := bdshemu.c
 
 OBJECTS := $(SRC_FILES:.c=.o)
 
-INCLUDES := -I. -I../inc -I../bddisasm/include -I../inc/bdshemu
+INCLUDES := -I. -I../inc -I../bddisasm/include
 
 ifeq ($(PLATFORM),)
 	PLATFORM := x64
@@ -119,5 +119,5 @@ clean: clean_lib_file clean_int_dir clean_dep_dir
 install: all
 	install -d $(DESTDIR)$(PREFIX)/lib/
 	install -m 644 $(OUT_DIR)/$(LIB_NAME) $(DESTDIR)$(PREFIX)/lib/
-	install -d $(DESTDIR)$(PREFIX)/include/bddisasm/bdshemu/
-	cp -r ../inc/bdshemu/* $(DESTDIR)$(PREFIX)/include/bddisasm/bdshemu/
\ No newline at end of file
+	install -d $(DESTDIR)$(PREFIX)/include/bddisasm/
+	cp -r ../inc/bdshemu.h $(DESTDIR)$(PREFIX)/include/bddisasm/
\ No newline at end of file
diff --git a/bdshemu/bdshemu.c b/bdshemu/bdshemu.c
index 991ac5a..3317cea 100644
--- a/bdshemu/bdshemu.c
+++ b/bdshemu/bdshemu.c
@@ -9,7 +9,7 @@
 
 #include "nd_crt.h"
 #include "bddisasm.h"
-#include "bdshemu/bdshemu.h"
+#include "bdshemu.h"
 
 
 //
diff --git a/bdshemu/bdshemu.vcxproj b/bdshemu/bdshemu.vcxproj
index 8b8e939..d2b40e0 100644
--- a/bdshemu/bdshemu.vcxproj
+++ b/bdshemu/bdshemu.vcxproj
@@ -405,7 +405,7 @@
     <ClCompile Include="bdshemu.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\inc\bdshemu\bdshemu.h" />
+    <ClInclude Include="..\inc\bdshemu.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/bdshemu/bdshemu.vcxproj.filters b/bdshemu/bdshemu.vcxproj.filters
index 626a3f0..ba58200 100644
--- a/bdshemu/bdshemu.vcxproj.filters
+++ b/bdshemu/bdshemu.vcxproj.filters
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\inc\bdshemu\bdshemu.h">
+    <ClInclude Include="..\inc\bdshemu.h">
       <Filter>Header Files\public</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/disasmtool/disasmtool.c b/disasmtool/disasmtool.c
index 4472f27..e15abcf 100644
--- a/disasmtool/disasmtool.c
+++ b/disasmtool/disasmtool.c
@@ -11,7 +11,7 @@
 typedef uint64_t    QWORD, *PQWORD;
 
 // Main disasm header file.
-#include "bdshemu\bdshemu.h"
+#include "bdshemu.h"
 #include "bddisasm.h"
 
 
diff --git a/disasmtool_lix/CMakeLists.txt b/disasmtool_lix/CMakeLists.txt
index 17ea8d8..b937996 100644
--- a/disasmtool_lix/CMakeLists.txt
+++ b/disasmtool_lix/CMakeLists.txt
@@ -253,7 +253,6 @@ endif()
 
 include_directories(
   ${DISASM_DIRECTORY}/inc
-  ${DISASM_DIRECTORY}/inc/bdshemu
   ${DISASM_DIRECTORY}/bddisasm/include
   )
 
diff --git a/inc/bdshemu/bdshemu.h b/inc/bdshemu.h
similarity index 100%
rename from inc/bdshemu/bdshemu.h
rename to inc/bdshemu.h