Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.11] Revert "[CMAKE] Use configured include files to define the

Browse source 
__RELFILE__ hack (#979)"

done in context of CORE-14839 (1 of 2 commits)

This reverts commit 0.4.11-dev-516-g
07bd6089ec.

cherry picked from commit 0.4.12-dev-28-g
05169a4987
This commit is contained in:
Timo Kreuzer 2018-12-09 14:23:55 +01:00 committed by Joachim Henze
parent 7d0eadda9f
commit 7cd586252f
5 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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")

7
sdk/include/reactos/builddir.h.cmake
View file

@ -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 */

7
sdk/include/reactos/debug.h
View file

@ -15,12 +15,7 @@
#pragma once
#ifndef __RELFILE__
# ifdef __REACTOS__
# include <reactos/builddir.h>
# 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 */

1
sdk/include/reactos/version.cmake
View file

@ -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)

7
sdk/include/reactos/wine/debug.h
View file

@ -28,12 +28,7 @@
#endif
#ifndef __RELFILE__
# ifdef __REACTOS__
# include <reactos/builddir.h>
# define __RELFILE__ &__FILE__[sizeof(REACTOS_SOURCE_DIR)]
# else
# define __RELFILE__ __FILE__
# endif
#define __RELFILE__ __FILE__
#endif
#ifdef __WINE_WINE_TEST_H