From 2e9717b57728b4092b1e490e22bafc10e960ab59 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 10 Nov 2010 22:50:21 +0000 Subject: [PATCH] [CMAKE] Create importlibs from spec files for kernel32, advapi32, gdi32, user32 and msvcrt calc now compiles with MSVC and works (slightly buggy) svn path=/branches/cmake-bringup/; revision=49554 --- dll/win32/advapi32/CMakeLists.txt | 2 +- dll/win32/gdi32/CMakeLists.txt | 2 +- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/msvcrt/CMakeLists.txt | 2 +- dll/win32/user32/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index 042f7f2f3de..98e8baa6f51 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -66,5 +66,5 @@ add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_cab_target(advapi32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) +add_importlib_target(advapi32.spec libntdll) diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt index 63ff7343788..9b56488d7a8 100644 --- a/dll/win32/gdi32/CMakeLists.txt +++ b/dll/win32/gdi32/CMakeLists.txt @@ -54,4 +54,4 @@ set_pdef_file(gdi32 gdi32.pdef) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_cab_target(gdi32 1) -add_importlib_target(gdi32.def) +add_importlib_target(gdi32.spec) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 40786687da5..bba175e393e 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -121,4 +121,4 @@ add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes) add_cab_target(kernel32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) +add_importlib_target(kernel32.spec) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index b4e8a375476..481f729ba7d 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -34,5 +34,5 @@ target_link_libraries(msvcrt add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll) add_cab_target(msvcrt 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def) +add_importlib_target(msvcrt.spec) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index 4ecb761371f..3ee1f7ff5dd 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -84,5 +84,5 @@ target_link_libraries(user32 add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) add_cab_target(user32 1) -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/user32.def) +add_importlib_target(user32.spec)