From 881457ce326a36b6797536d37824a38a0dd9b7e1 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 14 Apr 2013 15:09:52 +0000 Subject: [PATCH] [LOG2LINES] Partly fix MSVC build. Disable MSVC build for now. svn path=/trunk/; revision=58757 --- reactos/tools/CMakeLists.txt | 2 ++ reactos/tools/log2lines/compat.h | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/reactos/tools/CMakeLists.txt b/reactos/tools/CMakeLists.txt index 80d0d347276..79dd094bee4 100644 --- a/reactos/tools/CMakeLists.txt +++ b/reactos/tools/CMakeLists.txt @@ -11,7 +11,9 @@ add_subdirectory(cabman) add_subdirectory(cdmake) add_subdirectory(gendib) add_subdirectory(geninc) +if(NOT MSVC) add_subdirectory(log2lines) +endif() add_subdirectory(mkhive) add_subdirectory(obj2bin) add_subdirectory(spec2def) diff --git a/reactos/tools/log2lines/compat.h b/reactos/tools/log2lines/compat.h index 1b364db725b..57dd1a3493f 100644 --- a/reactos/tools/log2lines/compat.h +++ b/reactos/tools/log2lines/compat.h @@ -1,6 +1,6 @@ #pragma once -#if defined (__DJGPP__) || defined (__WIN32__) +#if defined(_WIN32) #include @@ -15,8 +15,7 @@ #define CP_CMD "copy /Y " #define DIR_FMT "dir /a:-d /s /b %s > %s" -#else /* not defined (__DJGPP__) || defined (__WIN32__) */ - +#else /* not defined (_WIN32) */ #include #include @@ -32,6 +31,6 @@ #define CP_CMD "cp -f " #define DIR_FMT "find %s -type f > %s" -#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ +#endif /* not defined (_WIN32) */ /* EOF */