mirror of
https://github.com/reactos/reactos.git
synced 2024-06-26 07:51:52 +00:00
Revert "[CMAKE] Use configured include files to define the __RELFILE__ hack (#979)"
This reverts commit 07bd6089ec
.
This commit is contained in:
parent
93164cf873
commit
05169a4987
|
@ -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")
|
||||
|
|
|
@ -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 */
|
|
@ -15,13 +15,8 @@
|
|||
#pragma once
|
||||
|
||||
#ifndef __RELFILE__
|
||||
# ifdef __REACTOS__
|
||||
# include <reactos/builddir.h>
|
||||
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
|
||||
# else
|
||||
#define __RELFILE__ __FILE__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
|
||||
#if !defined(_RTLFUNCS_H) && !defined(_NTDDK_)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -28,13 +28,8 @@
|
|||
#endif
|
||||
|
||||
#ifndef __RELFILE__
|
||||
# ifdef __REACTOS__
|
||||
# include <reactos/builddir.h>
|
||||
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
|
||||
# else
|
||||
#define __RELFILE__ __FILE__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __WINE_WINE_TEST_H
|
||||
#error This file should not be used in Wine tests
|
||||
|
|
Loading…
Reference in a new issue