[CMAKE]

- Enable MSVC build for Wine DirectX libraries, which mostly work just fine.

svn path=/trunk/; revision=56431

diff --git a/reactos/base/applications/CMakeLists.txt b/reactos/base/applications/CMakeLists.txt
index bac7357..a776a25 100644 (file)
--- a/reactos/base/applications/CMakeLists.txt
+++ b/reactos/base/applications/CMakeLists.txt
@@ -4,9 +4,7 @@ add_subdirectory(calc)
 add_subdirectory(charmap)
 add_subdirectory(cmdutils)
 add_subdirectory(control)
-if(NOT MSVC)
-    add_subdirectory(dxdiag) # FIXME: msvc build.
-endif()
+add_subdirectory(dxdiag)
 add_subdirectory(extrac32)
 add_subdirectory(findstr)
 add_subdirectory(fontview)

diff --git a/reactos/dll/directx/CMakeLists.txt b/reactos/dll/directx/CMakeLists.txt
index 0f8f70a..82037ad 100644 (file)
--- a/reactos/dll/directx/CMakeLists.txt
+++ b/reactos/dll/directx/CMakeLists.txt
@@ -4,9 +4,9 @@ add_subdirectory(amstream)
 add_subdirectory(d3d8thk)
 endif()
 #add_subdirectory(bdaplgin) #disabled in trunk
-#add_subdirectory(d3d8) #disabled in trunk
-#add_subdirectory(d3d9) #disabled in trunk
-#add_subdirectory(ddraw) #disabled in trunk
+#add_subdirectory(d3d8) #disabled in trunk, see wine subfolder
+#add_subdirectory(d3d9) #disabled in trunk, see wine subfolder
+#add_subdirectory(ddraw) #disabled in trunk, see wine subfolder
 add_subdirectory(devenum)
 add_subdirectory(dinput)
 add_subdirectory(dinput8)

diff --git a/reactos/dll/directx/wine/CMakeLists.txt b/reactos/dll/directx/wine/CMakeLists.txt
index 5958003..8839aa4 100644 (file)
--- a/reactos/dll/directx/wine/CMakeLists.txt
+++ b/reactos/dll/directx/wine/CMakeLists.txt
@@ -1,14 +1,15 @@
 
-if(NOT MSVC)
 add_subdirectory(d3d8)
 add_subdirectory(d3d9)
 add_subdirectory(d3dx9_24)
-add_subdirectory(d3dx9_25)
-add_subdirectory(d3dx9_26)
-add_subdirectory(d3dx9_27)
-add_subdirectory(d3dx9_28)
-add_subdirectory(d3dx9_29)
-add_subdirectory(d3dx9_30)
+if(NOT MSVC)
+    add_subdirectory(d3dx9_25)
+    add_subdirectory(d3dx9_26)
+    add_subdirectory(d3dx9_27)
+    add_subdirectory(d3dx9_28)
+    add_subdirectory(d3dx9_29)
+    add_subdirectory(d3dx9_30)
+endif()
 add_subdirectory(d3dx9_31)
 add_subdirectory(d3dx9_32)
 add_subdirectory(d3dx9_33)
@@ -22,5 +23,6 @@ add_subdirectory(d3dx9_40)
 add_subdirectory(d3dx9_41)
 add_subdirectory(d3dx9_42)
 add_subdirectory(ddraw)
-add_subdirectory(wined3d)
+if(NOT MSVC)
+    add_subdirectory(wined3d)
 endif()

diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
index 13ce94f..c17ecfe 100644 (file)
--- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
+++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_library(d3dx9_36 SHARED ${SOURCE})
 set_module_type(d3dx9_36 win32dll)
-target_link_libraries(d3dx9_36 wine)
+target_link_libraries(d3dx9_36 uuid wine)
 
 add_importlibs(d3dx9_36
     d3d9

diff --git a/reactos/dll/directx/wine/ddraw/CMakeLists.txt b/reactos/dll/directx/wine/ddraw/CMakeLists.txt
index 33d5755..1765459 100644 (file)
--- a/reactos/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/reactos/dll/directx/wine/ddraw/CMakeLists.txt
@@ -3,10 +3,6 @@ add_definitions(
     -D__WINESRC__
     -DUSE_WIN32_OPENGL)
 
-if(MSVC)
-    add_definitions(/FIwine/typeof.h)
-endif()
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
@@ -16,7 +12,6 @@ spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     clipper.c
     ddraw.c
-    ddraw.rc
     device.c
     executebuffer.c
     light.c
@@ -31,7 +26,16 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
 
-add_library(ddraw SHARED ${SOURCE})
+add_library(ddraw SHARED
+    ${SOURCE}
+    ddraw.rc)
+
+if(MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(ddraw "/FIwine/typeof.h")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
+endif()
+
 set_module_type(ddraw win32dll)
 
 target_link_libraries(ddraw
@@ -53,4 +57,3 @@ add_importlibs(ddraw
 add_dependencies(ddraw wineheaders)
 add_pch(ddraw ddraw_private.h)
 add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
-