[CMAKE]

[reactos.git] / CMakeMacros.cmake

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index 462fc9b..b2a7c68 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -61,7 +61,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
     add_custom_command(\r
         OUTPUT ${_object_file}\r
         COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file}\r
-        DEPENDS native-winebuild)\r
+        DEPENDS ${_asm_file})\r
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)\r
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})\r
     add_minicd(${_object_file} loader ${OBJECT_NAME})\r
@@ -121,8 +121,11 @@ MACRO(add_minicd FILENAME _dir _nameoncd)
 ENDMACRO(add_minicd)\r
 \r
 macro(set_cpp)\r
-  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)\r
+  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)\r
   set(IS_CPP 1)\r
+  add_definitions(\r
+    -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++\r
+    -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)\r
 endmacro()\r
 \r
 MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r