Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-21 16:04:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Now that we have c++ flags set globally, no need to mention them on the respective targets.
- debug.h : leftover from the kernel32 sync.

svn path=/branches/cmake-bringup/; revision=48543
This commit is contained in:
Amine Khaldi 2010-08-14 10:47:57 +00:00
parent 82edce4255
commit 5644c2c39d
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/reactos/debug.h
View file

@ -107,6 +107,11 @@ RtlAssert(
#define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#else /* not DBG */
/* On non-debug builds, we never show these */
@ -119,6 +124,11 @@ RtlAssert(
#define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
#endif /* not DBG */
#define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x))

2
lib/3rdparty/icu4ros/CMakeLists.txt vendored
View file

@ -7,8 +7,6 @@ add_definitions(-DU_HAVE_INTTYPES_H)
add_definitions(-DUCONFIG_NO_FILE_IO=1)
add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
set(SOURCE
"stubs.cpp"
"icu/source/common/bmpset.cpp"

3
lib/nls/idna/CMakeLists.txt
View file

@ -1,9 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
# Special C++ flags
add_definitions(-fno-exceptions -fno-rtti)
# Re-definition of WINVER
remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
add_definitions(-DWINVER=0x600) # And now we add our own

3
lib/nls/normalize/CMakeLists.txt
View file

@ -1,9 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
# Special C++ flags
add_definitions(-fno-exceptions -fno-rtti)
# Re-definition of WINVER
remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
add_definitions(-DWINVER=0x600) # And now we add our own

3
lib/nls/scripts/CMakeLists.txt
View file

@ -1,9 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common)
# Special C++ flags
add_definitions(-fno-exceptions -fno-rtti)
# Re-definition of WINVER
remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line
add_definitions(-DWINVER=0x600) # And now we add our own