[CMAKE] Zap builddir.h.cmake and instead define macros globally

This changes __RELFILE__ to always be relative and not rely on a GCC extension, since __FILE__ is *always* relative to the root.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 489bdbb..3b6235d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,9 @@ endif()
 include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)

+add_definitions(-DREACTOS_SOURCE_DIR="\\"${REACTOS_SOURCE_DIR}\\"")
+add_definitions(-DREACTOS_BINARY_DIR="\\"${REACTOS_BINARY_DIR}\\"")
+add_compile_flags(-D__RELFILE__="&__FILE__[sizeof REACTOS_SOURCE_DIR]")

 
 if(MSVC_IDE)
     add_compile_flags("/MP")
 
 if(MSVC_IDE)
     add_compile_flags("/MP")

diff --git a/sdk/include/reactos/builddir.h.cmake b/sdk/include/reactos/builddir.h.cmake
deleted file mode 100644 (file)
index 1e94f39..0000000
--- a/sdk/include/reactos/builddir.h.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Do not edit - Machine generated */
-
-#pragma once
-
-#define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@"
-#define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@"
-
-#if defined(__GNUC__)
-#define __RELFILE__ \
-    (!__builtin_strncmp(__FILE__, REACTOS_SOURCE_DIR, sizeof(REACTOS_SOURCE_DIR) - 1) \
-     ? __FILE__ + sizeof(REACTOS_SOURCE_DIR) : __FILE__)
-#else
-#define __RELFILE__ __FILE__
-#endif
-
-/* EOF */

diff --git a/sdk/include/reactos/debug.h b/sdk/include/reactos/debug.h
index adecac6..ab332fd 100644 (file)
--- a/sdk/include/reactos/debug.h
+++ b/sdk/include/reactos/debug.h
@@ -14,7 +14,9 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <builddir.h>
+#ifndef __RELFILE__
+#define __RELFILE__ __FILE__
+#endif

 
 /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
 #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_)
 
 /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
 #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_)

diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake
index e0eae0a..5bc2523 100644 (file)
--- a/sdk/include/reactos/version.cmake
+++ b/sdk/include/reactos/version.cmake
@@ -53,4 +53,3 @@ endif()
 
 configure_file(sdk/include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/version.h)
 configure_file(sdk/include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/buildno.h)
 
 configure_file(sdk/include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/version.h)
 configure_file(sdk/include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/buildno.h)

-configure_file(sdk/include/reactos/builddir.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/builddir.h)

diff --git a/sdk/include/reactos/wine/debug.h b/sdk/include/reactos/wine/debug.h
index 62f7da5..cd366ab 100644 (file)
--- a/sdk/include/reactos/wine/debug.h
+++ b/sdk/include/reactos/wine/debug.h
@@ -27,7 +27,9 @@
 #include <guiddef.h>
 #endif
 
 #include <guiddef.h>
 #endif
 

-#include <builddir.h>
+#ifndef __RELFILE__
+#define __RELFILE__ __FILE__
+#endif

 
 #ifdef __WINE_WINE_TEST_H
 #error This file should not be used in Wine tests
 
 #ifdef __WINE_WINE_TEST_H
 #error This file should not be used in Wine tests

diff --git a/win32ss/user/ntuser/win32kdebug.h b/win32ss/user/ntuser/win32kdebug.h
index dd58b75..1211994 100644 (file)
--- a/win32ss/user/ntuser/win32kdebug.h
+++ b/win32ss/user/ntuser/win32kdebug.h
@@ -29,8 +29,6 @@
 
 #if DBG
 
 
 #if DBG
 

-    #include <builddir.h>
-

     #if !defined(__RELFILE__)
         #define __RELFILE__ __FILE__
     #endif
     #if !defined(__RELFILE__)
         #define __RELFILE__ __FILE__
     #endif