[ros-diffs] [akhaldi] 52418: [CMAKE] * Add WIN32 and _WINDOWS definitions for i386 msvc builds. * Skip some modules that do not compile, in msvc build.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Wed Jun 22 11:31:01 2011
New Revision: 52418

URL: http://svn.reactos.org/svn/reactos?rev=52418&view=rev
Log:
[CMAKE]
* Add WIN32 and _WINDOWS definitions for i386 msvc builds.
* Skip some modules that do not compile, in msvc build.

Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/cmake/msvc.cmake
    trunk/reactos/dll/win32/CMakeLists.txt

Modified: trunk/reactos/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52418&r1=52417&r2=52418&view=diff
==============================================================================
--- trunk/reactos/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Jun 22 11:31:01 2011
@@ -47,7 +47,10 @@
     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()

Modified: trunk/reactos/cmake/msvc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52418&r1=52417&r2=52418&view=diff
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Jun 22 11:31:01 2011
@@ -13,8 +13,12 @@
     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 @@
 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)

Modified: trunk/reactos/dll/win32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?rev=52418&r1=52417&r2=52418&view=diff
==============================================================================
--- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 22 11:31:01 2011
@@ -89,9 +89,12 @@
 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_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(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(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)