From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Fri, 5 Nov 2010 13:46:48 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~595
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=fbf705275d70d97b0c7bca59bff2f0ce3b057073

[CMAKE]
Add more dll/ and drivers/ modules to bootcd.
Fix mesa32 definitions.

svn path=/branches/cmake-bringup/; revision=49483
---

diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt
index 40b6dcd9e42..91f5f57121c 100644
--- a/base/services/wlansvc/CMakeLists.txt
+++ b/base/services/wlansvc/CMakeLists.txt
@@ -14,3 +14,5 @@ add_importlibs(wlansvc
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(wlansvc 1)
\ No newline at end of file
diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt
index f6a959a294c..0bfa05ec680 100644
--- a/base/setup/vmwinst/CMakeLists.txt
+++ b/base/setup/vmwinst/CMakeLists.txt
@@ -17,3 +17,5 @@ add_importlibs(vmwinst
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(vmwinst 1)
\ No newline at end of file
diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt
index c9ec23a0f8c..8ca3e1a0ba0 100644
--- a/base/shell/explorer-new/CMakeLists.txt
+++ b/base/shell/explorer-new/CMakeLists.txt
@@ -34,3 +34,5 @@ add_importlibs(explorer_new
     msvcrt
     kernel32
     ntdll)
+
+add_cab_target(explorer_new 4)
\ No newline at end of file
diff --git a/dll/3rdparty/mesa32/CMakeLists.txt b/dll/3rdparty/mesa32/CMakeLists.txt
index e3275450bff..61cf259bf58 100644
--- a/dll/3rdparty/mesa32/CMakeLists.txt
+++ b/dll/3rdparty/mesa32/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(
     -DUSE_EXTERNAL_DXTN_LIB=1
     -DBUILD_GL32
     -DWIN32
-    -D_WINDOWS)
+    -DUSE_3DNOW_ASM)
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt
index 00ed1bcb937..f921abf547b 100644
--- a/drivers/battery/battc/CMakeLists.txt
+++ b/drivers/battery/battc/CMakeLists.txt
@@ -5,3 +5,5 @@ add_library(battc SHARED battc.c battc.rc)
 
 set_module_type(battc kernelmodedriver)
 add_importlibs(battc ntoskrnl hal)
+
+add_cab_target(battc 2)
\ No newline at end of file
diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt
index c5ce34a664c..751d84d27ff 100644
--- a/drivers/bus/acpi/cmbatt/CMakeLists.txt
+++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt
@@ -12,3 +12,6 @@ set_module_type(cmbatt kernelmodedriver)
 add_importlibs(cmbatt ntoskrnl hal battc wmilib)
 
 add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE})
+
+
+add_cab_target(cmbatt 2)
\ No newline at end of file
diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt
index 7df54b19e77..b985c6d16ab 100644
--- a/drivers/bus/acpi/compbatt/CMakeLists.txt
+++ b/drivers/bus/acpi/compbatt/CMakeLists.txt
@@ -11,3 +11,5 @@ set_module_type(compbatt kernelmodedriver)
 add_importlibs(compbatt ntoskrnl hal battc)
 
 add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE})
+
+add_cab_target(compbatt 2)
\ No newline at end of file
diff --git a/drivers/directx/dxapi/CMakeLists.txt b/drivers/directx/dxapi/CMakeLists.txt
index 172c045b56c..dda56228703 100644
--- a/drivers/directx/dxapi/CMakeLists.txt
+++ b/drivers/directx/dxapi/CMakeLists.txt
@@ -10,3 +10,5 @@ add_library(dxapi SHARED
 
 set_module_type(dxapi kernelmodedriver)
 add_importlibs(dxapi ntoskrnl hal videoprt)
+
+add_cab_target(dxapi 2)
\ No newline at end of file
diff --git a/drivers/directx/dxg/CMakeLists.txt b/drivers/directx/dxg/CMakeLists.txt
index 0062fc763ba..c142278e634 100644
--- a/drivers/directx/dxg/CMakeLists.txt
+++ b/drivers/directx/dxg/CMakeLists.txt
@@ -11,3 +11,5 @@ add_library(dxg SHARED
 
 set_module_type(dxg kernelmodedriver)
 add_importlibs(dxg dxgthk ntoskrnl)
+
+add_cab_target(dxg 2)
\ No newline at end of file
diff --git a/drivers/directx/dxgthk/CMakeLists.txt b/drivers/directx/dxgthk/CMakeLists.txt
index 162b51fa2e2..5d51d8a7ee8 100644
--- a/drivers/directx/dxgthk/CMakeLists.txt
+++ b/drivers/directx/dxgthk/CMakeLists.txt
@@ -8,3 +8,5 @@ add_library(dxgthk SHARED
 
 set_module_type(dxgthk kernelmodedriver)
 add_importlibs(dxgthk win32k)
+
+add_cab_target(dxgthk 2)
\ No newline at end of file
diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
index 37fd7de50b0..ec4ea6b501a 100644
--- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
+++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
@@ -62,3 +62,5 @@ endif(MSVC)
 set_module_type(portcls kernelmodedriver)
 
 add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt)
+
+add_cab_target(portcls 2)
\ No newline at end of file
diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
index 66272193fd9..583fe6ed552 100644
--- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt
+++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt
@@ -10,3 +10,5 @@ add_library(drmk SHARED
 
 set_module_type(drmk kernelmodedriver)
 add_importlibs(drmk ntoskrnl)
+
+add_cab_target(drmk 2)
\ No newline at end of file
diff --git a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
index 5460f445d61..49b90ae7130 100644
--- a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
+++ b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt
@@ -13,3 +13,5 @@ target_link_libraries(kmixer
     libsamplerate)
 
 add_importlibs(kmixer ntoskrnl ks hal)
+
+add_cab_target(kmixer 2)
\ No newline at end of file
diff --git a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
index 59f04bd7527..2c3107cd206 100644
--- a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
+++ b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt
@@ -21,3 +21,6 @@ target_link_libraries(wdmaud
     ${PSEH_LIB})
 
 add_importlibs(wdmaud ntoskrnl ks hal)
+
+
+add_cab_target(wdmaud 2)
\ No newline at end of file
diff --git a/drivers/wdm/audio/sysaudio/CMakeLists.txt b/drivers/wdm/audio/sysaudio/CMakeLists.txt
index 162aa29b9a3..b8ee459371a 100644
--- a/drivers/wdm/audio/sysaudio/CMakeLists.txt
+++ b/drivers/wdm/audio/sysaudio/CMakeLists.txt
@@ -14,3 +14,5 @@ set_module_type(sysaudio kernelmodedriver)
 target_link_libraries(sysaudio libcntpr)
 
 add_importlibs(sysaudio ntoskrnl ks hal)
+
+add_cab_target(sysaudio 2)
\ No newline at end of file
diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt
index 2cdacfbc074..b8c6aebf9e0 100644
--- a/drivers/wmi/CMakeLists.txt
+++ b/drivers/wmi/CMakeLists.txt
@@ -8,3 +8,5 @@ add_library(wmilib SHARED
 
 set_module_type(wmilib kernelmodedriver)
 add_importlibs(wmilib ntoskrnl)
+
+add_cab_target(wmilib 2)
\ No newline at end of file