diff --git a/CMakeLists.txt b/CMakeLists.txt index f79577f65d0..d2e8b861ee2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,9 @@ endif() 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") diff --git a/sdk/include/reactos/builddir.h.cmake b/sdk/include/reactos/builddir.h.cmake deleted file mode 100644 index 8bd5b44ac54..00000000000 --- a/sdk/include/reactos/builddir.h.cmake +++ /dev/null @@ -1,7 +0,0 @@ -/* Do not edit - Machine generated */ -#pragma once - -#define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@" -#define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@" - -/* EOF */ diff --git a/sdk/include/reactos/debug.h b/sdk/include/reactos/debug.h index f56090b65c6..ab332fda181 100644 --- a/sdk/include/reactos/debug.h +++ b/sdk/include/reactos/debug.h @@ -15,12 +15,7 @@ #pragma once #ifndef __RELFILE__ -# ifdef __REACTOS__ -# include -# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)] -# else -# define __RELFILE__ __FILE__ -# endif +#define __RELFILE__ __FILE__ #endif /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 6f9cec71678..c1c22ee9130 100644 --- 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/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 23f402a13fe..35aefc9852b 100644 --- a/sdk/include/reactos/wine/debug.h +++ b/sdk/include/reactos/wine/debug.h @@ -28,12 +28,7 @@ #endif #ifndef __RELFILE__ -# ifdef __REACTOS__ -# include -# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)] -# else -# define __RELFILE__ __FILE__ -# endif +#define __RELFILE__ __FILE__ #endif #ifdef __WINE_WINE_TEST_H