[ros-diffs] [spetreolle] 49483: [CMAKE] Add more dll/ and drivers/ modules to bootcd. Fix mesa32 definitions.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Fri Nov 5 13:46:50 UTC 2010


Author: spetreolle
Date: Fri Nov  5 13:46:48 2010
New Revision: 49483

URL: http://svn.reactos.org/svn/reactos?rev=49483&view=rev
Log:
[CMAKE]
Add more dll/ and drivers/ modules to bootcd.
Fix mesa32 definitions.

Modified:
    branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt
    branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt
    branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt
    branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt
    branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt
    branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt
    branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt
    branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt
    branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt
    branches/cmake-bringup/drivers/wmi/CMakeLists.txt

Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -14,3 +14,5 @@
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(wlansvc 1)

Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -17,3 +17,5 @@
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(vmwinst 1)

Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -34,3 +34,5 @@
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(explorer_new 4)

Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -3,7 +3,7 @@
     -DUSE_EXTERNAL_DXTN_LIB=1
     -DBUILD_GL32
     -DWIN32
-    -D_WINDOWS)
+    -DUSE_3DNOW_ASM)
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 

Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -5,3 +5,5 @@
 
 set_module_type(battc kernelmodedriver)
 add_importlibs(battc ntoskrnl hal)
+
+add_cab_target(battc 2)

Modified: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -12,3 +12,6 @@
 add_importlibs(cmbatt ntoskrnl hal battc wmilib)
 
 add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE})
+
+
+add_cab_target(cmbatt 2)

Modified: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -11,3 +11,5 @@
 add_importlibs(compbatt ntoskrnl hal battc)
 
 add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE})
+
+add_cab_target(compbatt 2)

Modified: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -10,3 +10,5 @@
 
 set_module_type(dxapi kernelmodedriver)
 add_importlibs(dxapi ntoskrnl hal videoprt)
+
+add_cab_target(dxapi 2)

Modified: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -11,3 +11,5 @@
 
 set_module_type(dxg kernelmodedriver)
 add_importlibs(dxg dxgthk ntoskrnl)
+
+add_cab_target(dxg 2)

Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -8,3 +8,5 @@
 
 set_module_type(dxgthk kernelmodedriver)
 add_importlibs(dxgthk win32k)
+
+add_cab_target(dxgthk 2)

Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -62,3 +62,5 @@
 set_module_type(portcls kernelmodedriver)
 
 add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt)
+
+add_cab_target(portcls 2)

Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -10,3 +10,5 @@
 
 set_module_type(drmk kernelmodedriver)
 add_importlibs(drmk ntoskrnl)
+
+add_cab_target(drmk 2)

Modified: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -13,3 +13,5 @@
     libsamplerate)
 
 add_importlibs(kmixer ntoskrnl ks hal)
+
+add_cab_target(kmixer 2)

Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -21,3 +21,6 @@
     ${PSEH_LIB})
 
 add_importlibs(wdmaud ntoskrnl ks hal)
+
+
+add_cab_target(wdmaud 2)

Modified: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -14,3 +14,5 @@
 target_link_libraries(sysaudio libcntpr)
 
 add_importlibs(sysaudio ntoskrnl ks hal)
+
+add_cab_target(sysaudio 2)

Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMakeLists.txt?rev=49483&r1=49482&r2=49483&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Nov  5 13:46:48 2010
@@ -8,3 +8,5 @@
 
 set_module_type(wmilib kernelmodedriver)
 add_importlibs(wmilib ntoskrnl)
+
+add_cab_target(wmilib 2)




More information about the Ros-diffs mailing list