[CMAKE]

  - add 3rdparty dlls to boot and live cd
  - use gdi32 spec file
  - mark user32.def as EXTERNAL_OBJECT

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

diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt
index 5f115b5..dfdaa31 100644 (file)
--- a/dll/3rdparty/dxtn/CMakeLists.txt
+++ b/dll/3rdparty/dxtn/CMakeLists.txt
@@ -15,3 +15,5 @@ set_entrypoint(dxtn 0)
 add_importlibs(dxtn msvcrt)
 
 add_dependencies(dxtn psdk buildno_header)
+
+add_cab_target(dxtn 1)

diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt
index 21f3451..c5fef2b 100644 (file)
--- a/dll/3rdparty/libjpeg/CMakeLists.txt
+++ b/dll/3rdparty/libjpeg/CMakeLists.txt
@@ -59,3 +59,5 @@ set_entrypoint(libjpeg 0)
 add_importlibs(libjpeg msvcrt)
 
 add_dependencies(libjpeg psdk buildno_header)
+
+add_cab_target(libjpeg 1)

diff --git a/dll/3rdparty/libpng/CMakeLists.txt b/dll/3rdparty/libpng/CMakeLists.txt
index 3fa61ec..8a94bc0 100644 (file)
--- a/dll/3rdparty/libpng/CMakeLists.txt
+++ b/dll/3rdparty/libpng/CMakeLists.txt
@@ -30,3 +30,5 @@ target_link_libraries(libpng mingw_common zlib)
 add_importlibs(libpng msvcrt kernel32)
 
 add_dependencies(libpng psdk buildno_header)
+
+add_cab_target(libpng 1)

diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt
index 0a8448d..6899435 100644 (file)
--- a/dll/3rdparty/libtiff/CMakeLists.txt
+++ b/dll/3rdparty/libtiff/CMakeLists.txt
@@ -58,3 +58,5 @@ target_link_libraries(libtiff mingw_common zlib getopt)
 add_importlibs(libtiff user32 msvcrt kernel32)
 
 add_dependencies(libtiff psdk buildno_header)
+
+add_cab_target(libtiff 1)

diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt
index 51d7fe5..68f2775 100644 (file)
--- a/dll/3rdparty/libxslt/CMakeLists.txt
+++ b/dll/3rdparty/libxslt/CMakeLists.txt
@@ -40,3 +40,5 @@ target_link_libraries(libxslt libxml2)
 add_importlibs(libxslt msvcrt ws2_32 kernel32)
 
 add_dependencies(libxslt psdk buildno_header)
+
+add_cab_target(libxslt 1)

diff --git a/dll/3rdparty/mesa32/CMakeLists.txt b/dll/3rdparty/mesa32/CMakeLists.txt
index f2a4c7b..e327545 100644 (file)
--- a/dll/3rdparty/mesa32/CMakeLists.txt
+++ b/dll/3rdparty/mesa32/CMakeLists.txt
@@ -218,7 +218,11 @@ list(APPEND SOURCE
     src/vbo/vbo_save_loopback.c
     src/vbo/vbo_split.c
     src/vbo/vbo_split_copy.c
-    src/vbo/vbo_split_inplace.c)
+    src/vbo/vbo_split_inplace.c
+    src/drivers/windows/icd/mesa.def)
+
+set_source_files_properties(src/drivers/windows/icd/mesa.def
+    PROPERTIES EXTERNAL_OBJECT TRUE)
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
@@ -261,8 +265,8 @@ if (NOT MSVC)
 endif(NOT MSVC)
 
 
-target_link_libraries(mesa32 ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/windows/icd/mesa.def)
-
 add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll)
 
 add_dependencies(mesa32 psdk buildno_header)
+
+add_cab_target(mesa32 1)

diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt
index 7d1245c..ceeca90 100644 (file)
--- a/dll/win32/gdi32/CMakeLists.txt
+++ b/dll/win32/gdi32/CMakeLists.txt
@@ -4,6 +4,8 @@ set_unicode()
 add_definitions(-D_DLL -D__USE_CRTIMP)
 add_definitions(-DLANGPACK)
 
+spec2def(gdi32.dll gdi32.spec)
+
 include_directories(include)
 
 list(APPEND SOURCE
@@ -37,7 +39,7 @@ list(APPEND SOURCE
     objects/utils.c
     objects/path.c
     gdi32.rc
-    gdi32.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def)
 
 add_library(gdi32 SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch

diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt
index c965005..f8a8f4c 100644 (file)
--- a/dll/win32/user32/CMakeLists.txt
+++ b/dll/win32/user32/CMakeLists.txt
@@ -64,7 +64,9 @@ list(APPEND SOURCE
     windows/winpos.c
     user32_stubs.c
     user32.rc
-    ${CMAKE_CURRENT_SOURCE_DIR}/user32.def)
+    user32.def)
+    
+set_source_files_properties(user32.def PROPERTIES EXTERNAL_OBJECT TRUE)
 
 add_library(user32 SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch