From 583b4eb6ef97f39a045587231432cbe2c97c5364 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 22 Jun 2011 11:31:01 +0000
Subject: [PATCH] [CMAKE] * Add WIN32 and _WINDOWS definitions for i386 msvc
 builds. * Skip some modules that do not compile, in msvc build.

svn path=/trunk/; revision=52418
---
 reactos/CMakeLists.txt           |  5 ++++-
 reactos/cmake/msvc.cmake         |  8 ++++++--
 reactos/dll/win32/CMakeLists.txt | 19 ++++++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index 5d97b672b21..21bebfb08b6 100644
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -47,7 +47,10 @@ if(NOT CMAKE_CROSSCOMPILING)
     add_definitions(-DTARGET_${ARCH})
 
     if(MSVC)
-        add_definitions(-Dinline=__inline)
+        if(ARCH MATCHES i386)
+            add_definitions(/DWIN32 /D_WINDOWS)
+        endif()
+        add_definitions(/Dinline=__inline)
     else()
         add_compiler_flags(-fshort-wchar)
     endif()
diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake
index e7c26e11d35..ff474e42aa5 100644
--- a/reactos/cmake/msvc.cmake
+++ b/reactos/cmake/msvc.cmake
@@ -13,8 +13,12 @@ elseif(OPTIMIZE STREQUAL "5")
     add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-)
 endif()
 
+if(ARCH MATCHES i386)
+    add_definitions(/DWIN32 /D_WINDOWS)
+endif()
+
 add_definitions(/X /GR- /GS- /Zl)
-add_definitions(-Dinline=__inline -D__STDC__=1)
+add_definitions(/Dinline=__inline /D__STDC__=1)
 
 if(${_MACHINE_ARCH_FLAG} MATCHES X86)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB")
@@ -23,7 +27,7 @@ if(${_MACHINE_ARCH_FLAG} MATCHES X86)
 endif()
 
 if(${ARCH} MATCHES amd64)
-    add_definitions(-D__x86_64)
+    add_definitions(/D__x86_64)
     set(SPEC2DEF_ARCH x86_64)
 else()
     set(SPEC2DEF_ARCH i386)
diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index 30d4b3b72c8..149a1ca9204 100644
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -89,9 +89,12 @@ add_subdirectory(msftedit)
 add_subdirectory(msg711.acm)
 add_subdirectory(msgina)
 add_subdirectory(msgsm32.acm)
-add_subdirectory(mshtml)
+if(NOT MSVC)
+    #FIXME: msvc build.
+    add_subdirectory(mshtml)
+    add_subdirectory(msi)
+endif()
 add_subdirectory(mshtml.tlb)
-add_subdirectory(msi)
 add_subdirectory(msimg32)
 add_subdirectory(msimtf)
 add_subdirectory(msisip)
@@ -164,7 +167,9 @@ add_subdirectory(sfc)
 add_subdirectory(sfc_os)
 add_subdirectory(shdoclc)
 add_subdirectory(shdocvw)
-add_subdirectory(shell32)
+if(NOT MSVC)
+    add_subdirectory(shell32) # FIXME: msvc build.
+endif()
 add_subdirectory(shfolder)
 add_subdirectory(shimgvw)
 add_subdirectory(shlwapi)
@@ -176,7 +181,9 @@ add_subdirectory(softpub)
 add_subdirectory(spoolss)
 add_subdirectory(srclient)
 add_subdirectory(stdole2.tlb)
-add_subdirectory(stdole32.tlb)
+if(NOT MSVC)
+    add_subdirectory(stdole32.tlb) # FIXME: msvc build.
+endif()
 add_subdirectory(sti)
 add_subdirectory(sxs)
 add_subdirectory(syssetup)
@@ -192,7 +199,9 @@ add_subdirectory(unicows)
 add_subdirectory(untfs)
 add_subdirectory(updspapi)
 add_subdirectory(url)
-add_subdirectory(urlmon)
+if(NOT MSVC)
+    add_subdirectory(urlmon) # FIXME: msvc build.
+endif()
 add_subdirectory(user32)
 add_subdirectory(userenv)
 add_subdirectory(usp10)