mirror of
https://github.com/reactos/reactos.git
synced 2025-02-23 00:45:24 +00:00
[0.4.11] Revert "[CMAKE] Use configured include files to define the
__RELFILE__ hack (#979)" done in context of CORE-14839 (1 of 2 commits) This reverts commit 0.4.11-dev-516-g07bd6089ec
. cherry picked from commit 0.4.12-dev-28-g05169a4987
This commit is contained in:
parent
7d0eadda9f
commit
7cd586252f
5 changed files with 5 additions and 20 deletions
|
@ -57,6 +57,9 @@ endif()
|
||||||
include(sdk/cmake/compilerflags.cmake)
|
include(sdk/cmake/compilerflags.cmake)
|
||||||
|
|
||||||
add_definitions(-D__REACTOS__)
|
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)
|
if(MSVC_IDE)
|
||||||
add_compile_flags("/MP")
|
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,12 +15,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifndef __RELFILE__
|
#ifndef __RELFILE__
|
||||||
# ifdef __REACTOS__
|
#define __RELFILE__ __FILE__
|
||||||
# include <reactos/builddir.h>
|
|
||||||
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
|
|
||||||
# else
|
|
||||||
# define __RELFILE__ __FILE__
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
|
/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */
|
||||||
|
|
|
@ -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/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/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,12 +28,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __RELFILE__
|
#ifndef __RELFILE__
|
||||||
# ifdef __REACTOS__
|
#define __RELFILE__ __FILE__
|
||||||
# include <reactos/builddir.h>
|
|
||||||
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
|
|
||||||
# else
|
|
||||||
# define __RELFILE__ __FILE__
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WINE_WINE_TEST_H
|
#ifdef __WINE_WINE_TEST_H
|
||||||
|
|
Loading…
Reference in a new issue