Skip to content

Commit 7cd5862

Browse files
tkreuzerJoachimHenze
authored andcommitted
[0.4.11] Revert "[CMAKE] Use configured include files to define the
__RELFILE__ hack (reactos#979)" done in context of CORE-14839 (1 of 2 commits) This reverts commit 0.4.11-dev-516-g 07bd608. cherry picked from commit 0.4.12-dev-28-g 05169a4
1 parent 7d0eadd commit 7cd5862

File tree

5 files changed

+5
-20
lines changed

5 files changed

+5
-20
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ endif()
5757
include(sdk/cmake/compilerflags.cmake)
5858

5959
add_definitions(-D__REACTOS__)
60+
add_definitions(-DREACTOS_SOURCE_DIR="\\"${REACTOS_SOURCE_DIR}\\"")
61+
add_definitions(-DREACTOS_BINARY_DIR="\\"${REACTOS_BINARY_DIR}\\"")
62+
add_compile_flags(-D__RELFILE__="&__FILE__[sizeof REACTOS_SOURCE_DIR]")
6063

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

sdk/include/reactos/builddir.h.cmake

Lines changed: 0 additions & 7 deletions
This file was deleted.

sdk/include/reactos/debug.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@
1515
#pragma once
1616

1717
#ifndef __RELFILE__
18-
# ifdef __REACTOS__
19-
# include <reactos/builddir.h>
20-
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
21-
# else
22-
# define __RELFILE__ __FILE__
23-
# endif
18+
#define __RELFILE__ __FILE__
2419
#endif
2520

2621
/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */

sdk/include/reactos/version.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,3 @@ endif()
5353

5454
configure_file(sdk/include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/version.h)
5555
configure_file(sdk/include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/buildno.h)
56-
configure_file(sdk/include/reactos/builddir.h.cmake ${REACTOS_BINARY_DIR}/sdk/include/reactos/builddir.h)

sdk/include/reactos/wine/debug.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@
2828
#endif
2929

3030
#ifndef __RELFILE__
31-
# ifdef __REACTOS__
32-
# include <reactos/builddir.h>
33-
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
34-
# else
35-
# define __RELFILE__ __FILE__
36-
# endif
31+
#define __RELFILE__ __FILE__
3732
#endif
3833

3934
#ifdef __WINE_WINE_TEST_H

0 commit comments

Comments
 (0)