[ros-diffs] [spetreolle] 52851: [ReactX] Add cmake build files for ReactX d3d8, d3d9, ddraw. Fix framebuf cmake build. Add a REACTX build flag to enable either ReactX or Wine dlls.

Author: spetreolle
Date: Sun Jul 24 21:30:07 2011
New Revision: 52851

URL: http://svn.reactos.org/svn/reactos?rev=52851&view=rev
Log:
[ReactX]
Add cmake build files for ReactX d3d8, d3d9, ddraw.
Fix framebuf cmake build.
Add a REACTX build flag to enable either ReactX or Wine dlls.

Added:
    branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt   (with props)
    branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt   (with props)
    branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt   (with props)
Modified:
    branches/reactx/reactos/cmake/config.cmake
    branches/reactx/reactos/dll/directx/CMakeLists.txt
    branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt
    branches/reactx/reactos/dll/directx/wine/CMakeLists.txt
    branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt

Modified: branches/reactx/reactos/cmake/config.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/cmake/config.cma…
==============================================================================
--- branches/reactx/reactos/cmake/config.cmake [iso-8859-1] (original)
+++ branches/reactx/reactos/cmake/config.cmake [iso-8859-1] Sun Jul 24 21:30:07 2011
@@ -55,3 +55,6 @@
 
 set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL
 "Whether to create a graphml dependency of dlls.")
+
+set(REACTX TRUE CACHE BOOL
+"Wether to compile support for ReactX dlls.")

Modified: branches/reactx/reactos/dll/directx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/CMak…
==============================================================================
--- branches/reactx/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07
2011
@@ -1,12 +1,13 @@
-
 if (NOT MSVC)
 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
+if(REACTX)
+  add_subdirectory(d3d8)
+  add_subdirectory(d3d9)
+  add_subdirectory(ddraw)
+endif()
 add_subdirectory(devenum)
 add_subdirectory(dinput)
 add_subdirectory(dinput8)

Added: branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8…
==============================================================================
--- branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt (added)
+++ branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt [iso-8859-1] Sun Jul 24
21:30:07 2011
@@ -1,0 +1,20 @@
+set_rc_compiler()
+
+spec2def(d3d8.dll d3d8.spec)
+
+list(APPEND SOURCE
+    d3d8.c)
+
+add_library(d3d8 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
+
+set_module_type(d3d8 win32dll)
+
+add_importlibs(d3d8
+    user32
+    gdi32
+    advapi32
+    msvcrt
+    kernel32
+    ntdll)
+
+add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all)

Propchange: branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8…
==============================================================================
--- branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] Sun Jul 24
21:30:07 2011
@@ -10,3 +10,5 @@
 add_dependencies(d3d8thk psdk)
 
 add_cd_file(TARGET d3d8thk DESTINATION reactos/system32 FOR all)
+
+add_importlib_target(d3d8thk.spec)

Added: branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d9…
==============================================================================
--- branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt (added)
+++ branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt [iso-8859-1] Sun Jul 24
21:30:07 2011
@@ -1,0 +1,41 @@
+spec2def(d3d9.dll d3d9.spec)
+
+list(APPEND SOURCE
+    d3d9.c
+    d3d9_baseobject.c
+    d3d9_callbacks.c
+    d3d9_caps.c
+    d3d9_create.c
+    d3d9_cursor.c
+    d3d9_device.c
+    d3d9_haldevice.c
+    d3d9_helpers.c
+    d3d9_impl.c
+    d3d9_mipmap.c
+    d3d9_puredevice.c
+    d3d9_resource.c
+    d3d9_swapchain.c
+    d3d9_texture.c
+    adapter.c
+    device.c
+    format.c
+    d3d9.rc)
+
+add_library(d3d9 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
+
+set_module_type(d3d9 win32dll)
+
+target_link_libraries(d3d9 uuid dxguid)
+
+add_importlibs(d3d9
+    advapi32
+    user32
+    gdi32
+    version
+    d3d8thk
+    msvcrt
+    kernel32
+    ntdll)
+add_importlib_target(d3d9.spec)
+
+add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all)

Propchange: branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra…
==============================================================================
--- branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt (added)
+++ branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt [iso-8859-1] Sun Jul 24
21:30:07 2011
@@ -1,0 +1,64 @@
+set_rc_compiler()
+
+spec2def(ddraw.dll ddraw.spec)
+
+list(APPEND SOURCE
+    ddraw.rc
+    main.c
+    startup.c
+    cleanup.c
+    Ddraw/ddraw_main.c
+    Ddraw/ddraw_displaymode.c
+    Ddraw/ddraw_setcooperativelevel.c
+    Ddraw/GetCaps.c
+    Ddraw/GetDeviceIdentifier.c
+    Ddraw/ddraw_stubs.c
+    Ddraw/callbacks_dd_hel.c
+    Surface/surface_stubs.c
+    Surface/surface_main.c
+    Surface/callbacks_surf_hel.c
+    Surface/createsurface.c
+    Clipper/clipper_stubs.c
+    Clipper/clipper_main.c
+    Color/color_stubs.c
+    d3d/DirectD3D_main.c
+    Gamma/gamma_stubs.c
+    Kernel/kernel_stubs.c
+    Palette/palette.c
+    Palette/createpalette.c
+    Videoport/videoport_stubs.c
+    Vtable/DirectDraw7_Vtable.c
+    Vtable/DirectDraw4_Vtable.c
+    Vtable/DirectDraw2_Vtable.c
+    Vtable/DirectDraw_Vtable.c
+    Vtable/DirectDrawSurface7_Vtable.c
+    Vtable/DirectDrawSurface4_Vtable.c
+    Vtable/DirectDrawSurface3_Vtable.c
+    Vtable/DirectDrawSurface2_Vtable.c
+    Vtable/DirectDrawSurface_Vtable.c
+    Vtable/DirectD3D_Vtable.c
+    Vtable/DirectD3D2_Vtable.c
+    Vtable/DirectD3D3_Vtable.c
+    Vtable/DirectD3D7_Vtable.c)
+
+add_library(ddraw SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
+
+set_module_type(ddraw win32dll)
+
+target_link_libraries(ddraw
+    uuid
+    dxguid
+    ${PSEH_LIB})
+
+add_importlibs(ddraw
+    user32
+    gdi32
+    d3d8thk
+    ole32
+    advapi32
+    msvcrt
+    kernel32
+    ntdll)
+add_importlib_target(ddraw.spec)
+
+add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)

Propchange: branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/reactx/reactos/dll/directx/wine/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine…
==============================================================================
--- branches/reactx/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original)
+++ branches/reactx/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Sun Jul 24
21:30:07 2011
@@ -1,7 +1,11 @@
 
 if(NOT MSVC)
-add_subdirectory(d3d8)
-add_subdirectory(d3d9)
+if(NOT REACTX)
+  add_subdirectory(d3d8)
+  add_subdirectory(d3d9)
+  add_subdirectory(ddraw)
+  add_subdirectory(wined3d)
+endif()
 add_subdirectory(d3dx9_24)
 add_subdirectory(d3dx9_25)
 add_subdirectory(d3dx9_26)
@@ -21,6 +25,4 @@
 add_subdirectory(d3dx9_40)
 add_subdirectory(d3dx9_41)
 add_subdirectory(d3dx9_42)
-add_subdirectory(ddraw)
-add_subdirectory(wined3d)
 endif()

Modified: branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di…
==============================================================================
--- branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1]
Sun Jul 24 21:30:07 2011
@@ -1,14 +1,21 @@
 
 spec2def(framebuf.dll framebuf.spec)
 
-add_library(framebuf SHARED
+list(APPEND SOURCE
     enable.c
     palette.c
     pointer.c
     screen.c
     surface.c
-    framebuf.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
+    framebuf.rc)
+
+if(REACTX)
+list(APPEND SOURCE
+    dd.c
+    ddenable.c)
+endif()
+
+add_library(framebuf SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
 
 set_entrypoint(framebuf DrvEnableDriver@12)
 set_subsystem(framebuf native)