[ros-diffs] [spetreolle] 49498: [CMAKE] Bootcd: Add some directx dlls.

Author: spetreolle
Date: Fri Nov  5 21:49:09 2010
New Revision: 49498

URL: http://svn.reactos.org/svn/reactos?rev=49498&view=rev
Log:
[CMAKE]
Bootcd: Add some directx dlls.

Added:
    branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt   (with props)
    branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/dll/directx/CMakeLists.txt
    branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt
    branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt
    branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt
    branches/cmake-bringup/dll/win32/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake…
==============================================================================
--- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:49:09
2010
@@ -1,10 +1,10 @@
 
 add_subdirectory(amstream)
-#add_subdirectory(bdaplgin)
-#add_subdirectory(d3d8)
+#add_subdirectory(bdaplgin) #disabled in trunk
+#add_subdirectory(d3d8) #disabled in trunk
 add_subdirectory(d3d8thk)
-#add_subdirectory(d3d9)
-#add_subdirectory(ddraw)
+#add_subdirectory(d3d9) #disabled in trunk
+#add_subdirectory(ddraw) #disabled in trunk
 add_subdirectory(devenum)
 add_subdirectory(dinput)
 add_subdirectory(dinput8)
@@ -17,8 +17,8 @@
 #add_subdirectory(ksproxy)# undefined reference to `operator new(unsigned int)'
 add_subdirectory(ksuser)
 add_subdirectory(msdmo)
-#add_subdirectory(msdvbnp)
-#add_subdirectory(msvidctl)
+#add_subdirectory(msdvbnp) #disabled in trunk
+#add_subdirectory(msvidctl) #disabled in trunk
 add_subdirectory(qedit)
 add_subdirectory(quartz)
-#add_subdirectory(wine)
+add_subdirectory(wine)

Modified: branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/d3d8t…
==============================================================================
--- branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -8,3 +8,5 @@
 add_importlibs(d3d8thk gdi32)
 
 add_dependencies(d3d8thk psdk buildno_header)
+
+add_cab_target(d3d8thk 1)

Modified: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu…
==============================================================================
--- branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -30,3 +30,5 @@
     ntdll)
 
 add_dependencies(dinput8 psdk buildno_header)
+
+add_cab_target(dinput8 1)

Modified: branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dmusi…
==============================================================================
--- branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -38,3 +38,5 @@
     ntdll)
 
 add_dependencies(dmusic psdk buildno_header)
+
+add_cab_target(dmusic 1)

Modified: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay…
==============================================================================
--- branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -22,3 +22,5 @@
     ntdll)
 
 add_dependencies(dplay psdk buildno_header)
+
+add_cab_target(dplay 1)

Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -1,3 +1,4 @@
+set_cpp()
 
 spec2def(ksproxy.ax ksproxy.spec)
 
@@ -37,8 +38,9 @@
     advapi32
     ole32
     setupapi
+    ksuser
     msvcrt
-    ksuser
+    kernel32
     ntdll)
 
 add_dependencies(ksproxy psdk buildno_header)

Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo…
==============================================================================
--- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -27,3 +27,5 @@
     ntdll)
 
 add_dependencies(msdmo dxdsk psdk buildno_header)
+
+add_cab_target(msdmo 1)

Modified: branches/cmake-bringup/dll/directx/wine/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -20,5 +20,5 @@
 #add_subdirectory(d3dx9_40)
 #add_subdirectory(d3dx9_41)
 #add_subdirectory(d3dx9_42)
-#add_subdirectory(ddraw)
-#add_subdirectory(wined3d)
+add_subdirectory(ddraw)
+add_subdirectory(wined3d)

Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -12,12 +12,12 @@
     d3d8_main.c
     device.c
     directx.c
-    indexbuffer.c
-    pixelshader.c
+    #indexbuffer.c
+    #pixelshader.c
     surface.c
     swapchain.c
     texture.c
-    vertexbuffer.c
+    #vertexbuffer.c
     vertexdeclaration.c
     vertexshader.c
     volume.c

Added: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -1,0 +1,52 @@
+set_rc_compiler()
+
+spec2def(ddraw.dll ddraw.spec)
+
+list(APPEND SOURCE
+    clipper.c
+    ddraw.c
+    device.c
+    executebuffer.c
+    light.c
+    main.c
+    material.c
+    palette.c
+    parent.c
+    regsvr.c
+    stubs.c
+    surface.c
+    utils.c
+    vertexbuffer.c
+    viewport.c
+    version.rc
+    ddraw.def)
+
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
+if(MSVC)
+    add_definitions(/FIwine/typeof.h)
+endif()
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_library(ddraw SHARED ${SOURCE})
+set_module_type(ddraw win32dll)
+
+target_link_libraries(ddraw
+    ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def
+    wine
+    uuid
+    dxguid
+    ${PSEH_LIB})
+
+add_importlibs(ddraw
+    advapi32
+    gdi32
+    ole32
+    user32
+    wined3d
+    msvcrt
+    kernel32
+    ntdll)
+    

Propchange: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Fri Nov  5
21:49:09 2010
@@ -1,0 +1,73 @@
+set_rc_compiler()
+
+spec2def(wined3.dll wined3d.spec)
+
+list(APPEND SOURCE
+    ati_fragment_shader.c
+    arb_program_shader.c
+    basetexture.c
+    buffer.c
+    clipper.c
+    context.c
+    cubetexture.c
+    device.c
+    directx.c
+    drawprim.c
+    gl_compat.c
+    glsl_shader.c
+    nvidia_texture_shader.c
+    palette.c
+    query.c
+    resource.c
+    shader.c
+    shader_sm1.c
+    shader_sm4.c
+    state.c
+    stateblock.c
+    surface_base.c
+    surface.c
+    surface_gdi.c 
+    swapchain.c
+    swapchain_base.c
+    swapchain_gdi.c
+    texture.c
+    utils.c
+    vertexdeclaration.c
+    view.c
+    volume.c
+    volumetexture.c
+    wined3d_main.c
+    version.rc
+    wined3d.def)
+
+if(ARCH MATCHES amd64)
+list(APPEND SOURCE
+     powf.c
+     sqrtf.c)
+endif()
+
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_library(wined3d SHARED ${SOURCE})
+set_module_type(wined3d win32dll)
+
+target_link_libraries(wined3d
+    ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def
+    wine
+    uuid)
+
+add_importlibs(wined3d
+    user32
+    opengl32
+    gdi32
+    advapi32
+    msvcrt
+    kernel32
+    ntdll)
+add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
+
+add_cab_target(wined3d 1)

Propchange: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi…
==============================================================================
--- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:49:09 2010
@@ -12,7 +12,7 @@
 add_subdirectory(batt)
 add_subdirectory(bcrypt)
 add_subdirectory(beepmidi)
-#add_subdirectory(browseui)#FIXME: shellbrowser.cpp:152: error: expected constructor,
destructor, or type conversion before 'SHAlloc'
+#add_subdirectory(browseui) #FIXME: shellbrowser.cpp:152: error: expected constructor,
destructor, or type conversion before 'SHAlloc'
 add_subdirectory(cabinet)
 add_subdirectory(cards)
 add_subdirectory(cfgmgr32)
@@ -56,7 +56,7 @@
 add_subdirectory(initpki)
 add_subdirectory(inseng)
 add_subdirectory(iphlpapi)
-#add_subdirectory(iprtprio)
+#add_subdirectory(iprtprio) # not built in trunk
 add_subdirectory(itircl)
 add_subdirectory(itss)
 add_subdirectory(jscript)
@@ -199,13 +199,13 @@
 add_subdirectory(version)
 add_subdirectory(wdmaud.drv)
 add_subdirectory(windowscodecs)
-#add_subdirectory(winemp3.acm)#FIXME: ertr000001.o:(.rdata+0x0): undefined reference to
`_pei386_runtime_relocator)'
+#add_subdirectory(winemp3.acm) #FIXME: ertr000001.o:(.rdata+0x0): undefined reference to
`_pei386_runtime_relocator)'
 add_subdirectory(winfax)
 add_subdirectory(wing32)
 add_subdirectory(winhttp)
 add_subdirectory(wininet)
 add_subdirectory(winmm)
-#add_subdirectory(winscard)
+#add_subdirectory(winscard) # not built in trunk
 add_subdirectory(winspool)
 add_subdirectory(winsta)
 add_subdirectory(wintrust)