From 2bf9800b966312643ff7047c4139c04296fdfb06 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 10 Nov 2014 19:21:06 +0000
Subject: [PATCH] [CMAKE][BOOTSECT] * Improve some inclusions (avoid ../
 types).

svn path=/trunk/; revision=65368
---
 reactos/boot/freeldr/bootsect/fat.S     | 2 +-
 reactos/boot/freeldr/bootsect/fat32.S   | 2 +-
 reactos/boot/freeldr/bootsect/fatx.S    | 2 +-
 reactos/boot/freeldr/bootsect/isoboot.S | 2 +-
 reactos/cmake/gcc.cmake                 | 2 +-
 reactos/cmake/msvc.cmake                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/boot/freeldr/bootsect/fat.S b/reactos/boot/freeldr/bootsect/fat.S
index e9eb2ee8982..913c50dfff7 100644
--- a/reactos/boot/freeldr/bootsect/fat.S
+++ b/reactos/boot/freeldr/bootsect/fat.S
@@ -39,7 +39,7 @@
 // boots dramatically.
 
 #include <asm.inc>
-#include "../freeldr/include/arch/pc/x86common.h"
+#include <freeldr/include/arch/pc/x86common.h>
 
 #define BP_REL(x) [bp+x-offset start]
 
diff --git a/reactos/boot/freeldr/bootsect/fat32.S b/reactos/boot/freeldr/bootsect/fat32.S
index 96ff1880564..f2a91c20a5d 100644
--- a/reactos/boot/freeldr/bootsect/fat32.S
+++ b/reactos/boot/freeldr/bootsect/fat32.S
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <asm.inc>
-#include "../freeldr/include/arch/pc/x86common.h"
+#include <freeldr/include/arch/pc/x86common.h>
 
 #define BP_REL(x) [bp+x-offset start]
 
diff --git a/reactos/boot/freeldr/bootsect/fatx.S b/reactos/boot/freeldr/bootsect/fatx.S
index 393ea1d2897..440ca890bf3 100644
--- a/reactos/boot/freeldr/bootsect/fatx.S
+++ b/reactos/boot/freeldr/bootsect/fatx.S
@@ -30,7 +30,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <asm.inc>
-#include "../freeldr/include/arch/pc/x86common.h"
+#include <freeldr/include/arch/pc/x86common.h>
 
 #define ADDRESS_FOR_DIRENTRIES HEX(10000)
 
diff --git a/reactos/boot/freeldr/bootsect/isoboot.S b/reactos/boot/freeldr/bootsect/isoboot.S
index 5b362ca3d19..ee200b2c877 100644
--- a/reactos/boot/freeldr/bootsect/isoboot.S
+++ b/reactos/boot/freeldr/bootsect/isoboot.S
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <asm.inc>
-#include "../freeldr/include/arch/pc/x86common.h"
+#include <freeldr/include/arch/pc/x86common.h>
 
 .code16
 
diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index 6ed8fe5cbd2..b8a3fac71d4 100644
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -404,7 +404,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
 
     add_custom_command(
         OUTPUT ${_object_file}
-        COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ${_asm_file}
+        COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -I${REACTOS_SOURCE_DIR}/boot/freeldr -D__ASM__ -c ${_asm_file}
         DEPENDS ${_asm_file})
 
     add_custom_command(
diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index 05cf755315a..05f515cdb2e 100644
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -367,7 +367,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
 
     add_custom_command(
         OUTPUT ${_temp_file}
-        COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
+        COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /I${REACTOS_SOURCE_DIR}/boot/freeldr /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
         DEPENDS ${_asm_file})
 
     if(ARCH STREQUAL "arm")