From cef6a5b69183b952c2044e37d2ebc038ce6fc877 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Mon, 21 Oct 2019 00:38:24 +0200 Subject: [PATCH 1/1] [D3D8][D3D9][DDRAW][WINED3D] Use modules instead of shared libraries This reverts part of (revert) commit 81cffd7658765be610e53bcd9489a3d73597e5eb, so restores 23373acbb9b5356422657fa8448d2a18270847e2. --- dll/directx/wine/d3d8/CMakeLists.txt | 2 +- dll/directx/wine/d3d9/CMakeLists.txt | 2 +- dll/directx/wine/ddraw/CMakeLists.txt | 2 +- dll/directx/wine/wined3d/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index 09d7a6c659d..d3d49e2e76d 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND SOURCE volume.c precomp.h) -add_library(d3d8 SHARED +add_library(d3d8 MODULE ${SOURCE} guid.c version.rc diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt index 223606b87ee..14dd3e65320 100644 --- a/dll/directx/wine/d3d9/CMakeLists.txt +++ b/dll/directx/wine/d3d9/CMakeLists.txt @@ -21,7 +21,7 @@ list(APPEND SOURCE volume.c precomp.h) -add_library(d3d9 SHARED +add_library(d3d9 MODULE ${SOURCE} guid.c version.rc diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index 6141d630f3f..03029bdc8f9 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -29,7 +29,7 @@ if(MSVC) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif() -add_library(ddraw SHARED +add_library(ddraw MODULE ${SOURCE} ddraw.rc ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 235adab9027..29b337e3bd1 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -41,7 +41,7 @@ list(APPEND SOURCE wined3d_main.c precomp.h) -add_library(d3dwine SHARED +add_library(d3dwine MODULE ${SOURCE} version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dwine.def) -- 2.17.1