Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions

View File

@@ -1,28 +1,31 @@
From 067858d5fc5eedfd513b38cd4ed2c69a1b1d1270 Mon Sep 17 00:00:00 2001
From 48d707f925a861df887aa11c13e062aa700bf3d8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 14 Dec 2014 20:49:28 +0100
Subject: wined3d: Add second dll with STAGING_CSMT definition set.
Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT
definition set.
---
configure.ac | 1 +
configure.ac | 3 ++-
dlls/wined3d-csmt/Makefile.in | 37 +++++++++++++++++++++++++++++++++++++
dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
3 files changed, 66 insertions(+), 1 deletion(-)
create mode 100644 dlls/wined3d-csmt/Makefile.in
create mode 100644 dlls/wined3d-csmt/version.rc
diff --git a/configure.ac b/configure.ac
index 1ff19c4..bf2414d 100644
index 234d288..9161305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3424,6 +3424,7 @@ WINE_CONFIG_DLL(winealsa.drv)
@@ -3805,7 +3805,8 @@ WINE_CONFIG_DLL(wineandroid.drv)
WINE_CONFIG_DLL(winebus.sys)
WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0)
-WINE_CONFIG_DLL(wined3d)
+WINE_CONFIG_DLL(wined3d-csmt)
WINE_CONFIG_DLL(wined3d,,[implib])
+WINE_CONFIG_DLL(wined3d,,[implib])
WINE_CONFIG_DLL(winegstreamer)
WINE_CONFIG_DLL(winehid.sys)
WINE_CONFIG_DLL(winejoystick.drv)
diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in
new file mode 100644
index 0000000..bf064ed
@@ -100,5 +103,5 @@ index 0000000..2fa8710
+
+#include "wine/wine_common_ver.rc"
--
2.9.0
1.9.1