[ros-diffs] [tfaber] 56551: [WORDPAD] - Fix _WIN32_IE redefinition See issue #7047 for more details.

Author: tfaber
Date: Wed May  9 10:43:26 2012
New Revision: 56551

URL: http://svn.reactos.org/svn/reactos?rev=56551&view=rev
Log:
[WORDPAD]
- Fix _WIN32_IE redefinition
See issue #7047 for more details.

Modified:
    trunk/reactos/base/applications/wordpad/CMakeLists.txt

Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/C...
==============================================================================
--- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Wed May  9 10:43:26 2012
@@ -1,24 +1,20 @@
+
+remove_definitions(-D_WIN32_IE=0x600)
+
+add_definitions(-D__ROS_LONG64__)

include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-add_definitions(-D__ROS_LONG64__)

list(APPEND SOURCE
     olecallback.c
     print.c
     registry.c
-    wordpad.c)
+    wordpad.c
+    rsrc.rc)

-add_executable(wordpad
-    ${SOURCE}
-    rsrc.rc)
+add_executable(wordpad ${SOURCE})

set_module_type(wordpad win32gui)
 target_link_libraries(wordpad wine uuid)
 add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(wordpad)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()