From ee5db18b723a563328e89321e99e7a25e9e9bc78 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Fri, 18 Feb 2011 00:39:31 +0000 Subject: [PATCH] - Fix xinput msvc build - Powered by Amine svn path=/branches/cmake-bringup/; revision=50777 --- dll/win32/xinput1_1/CMakeLists.txt | 2 +- dll/win32/xinput1_2/CMakeLists.txt | 2 +- dll/win32/xinput1_3/CMakeLists.txt | 1 + dll/win32/xinput9_1_0/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt index 21cd477f993..24bd1d571fb 100644 --- a/dll/win32/xinput1_1/CMakeLists.txt +++ b/dll/win32/xinput1_1/CMakeLists.txt @@ -12,5 +12,5 @@ list(APPEND SOURCE add_library(xinput1_1 SHARED ${SOURCE}) set_module_type(xinput1_1 win32dll) -add_importlibs(xinput1_1 msvcrt kernel32) +add_importlibs(xinput1_1 msvcrt kernel32 xinput1_3) add_cab_target(xinput1_1 1) diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt index 91ab3890af2..ab02343a360 100644 --- a/dll/win32/xinput1_2/CMakeLists.txt +++ b/dll/win32/xinput1_2/CMakeLists.txt @@ -12,5 +12,5 @@ list(APPEND SOURCE add_library(xinput1_2 SHARED ${SOURCE}) set_module_type(xinput1_2 win32dll) -add_importlibs(xinput1_2 msvcrt kernel32) +add_importlibs(xinput1_2 msvcrt kernel32 xinput1_3) add_cab_target(xinput1_2 1) diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt index 7f443e7bda5..c245de9cf80 100644 --- a/dll/win32/xinput1_3/CMakeLists.txt +++ b/dll/win32/xinput1_3/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE add_library(xinput1_3 SHARED ${SOURCE}) +add_importlib_target(xinput1_3.spec) set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt index d8057ef1517..1d1efc01eef 100644 --- a/dll/win32/xinput9_1_0/CMakeLists.txt +++ b/dll/win32/xinput9_1_0/CMakeLists.txt @@ -12,5 +12,5 @@ list(APPEND SOURCE add_library(xinput9_1_0 SHARED ${SOURCE}) set_module_type(xinput9_1_0 win32dll) -add_importlibs(xinput9_1_0 msvcrt kernel32) +add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3) add_cab_target(xinput9_1_0 1)