[ros-diffs] [akhaldi] 65368: [CMAKE][BOOTSECT] * Improve some inclusions (avoid ../ types).

Author: akhaldi
Date: Mon Nov 10 19:21:06 2014
New Revision: 65368

URL: http://svn.reactos.org/svn/reactos?rev=65368&view=rev
Log:
[CMAKE][BOOTSECT]
* Improve some inclusions (avoid ../ types).

Modified:
    trunk/reactos/boot/freeldr/bootsect/fat.S
    trunk/reactos/boot/freeldr/bootsect/fat32.S
    trunk/reactos/boot/freeldr/bootsect/fatx.S
    trunk/reactos/boot/freeldr/bootsect/isoboot.S
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/boot/freeldr/bootsect/fat.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/fat.S	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/fat.S	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -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]
 

Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/fat32.S	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/fat32.S	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -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]
 

Modified: trunk/reactos/boot/freeldr/bootsect/fatx.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fatx…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/fatx.S	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/fatx.S	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -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)
 

Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isoboot.S	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isoboot.S	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <asm.inc>
-#include "../freeldr/include/arch/pc/x86common.h"
+#include <freeldr/include/arch/pc/x86common.h>
 
 .code16
 

Modified: trunk/reactos/cmake/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=65368&…
==============================================================================
--- trunk/reactos/cmake/gcc.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -404,7 +404,7 @@
 
     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(

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=65368…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake	[iso-8859-1] Mon Nov 10 19:21:06 2014
@@ -367,7 +367,7 @@
 
     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")