Move bdhsemu.h to inc/

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/
+	install -d $(DESTDIR)$(PREFIX)/include/bddisasm/
+	cp -r ../inc/bdshemu.h $(DESTDIR)$(PREFIX)/include/bddisasm/

bdshemu/bdshemu.c

@@ -9,7 +9,7 @@
 
 #include "nd_crt.h"
 #include "bddisasm.h"
-#include "bdshemu/bdshemu.h"
+#include "bdshemu.h"
 
 
 //

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">

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>

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"
 
 

disasmtool_lix/CMakeLists.txt

@@ -253,7 +253,6 @@ endif()
 
 include_directories(
   ${DISASM_DIRECTORY}/inc
-  ${DISASM_DIRECTORY}/inc/bdshemu
   ${DISASM_DIRECTORY}/bddisasm/include
   )