Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions

View File

@@ -1,30 +1,28 @@
From 359733a8080403adeca1f87472cdad1884c4affb Mon Sep 17 00:00:00 2001
From 6420a142c91174e9553960a3340ca6f38ba3c643 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 14 Dec 2014 20:49:28 +0100
Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT definition set.
---
configure.ac | 3 ++-
configure.ac | 1 +
dlls/wined3d-csmt/Makefile.in | 36 ++++++++++++++++++++++++++++++++++++
dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 1 deletion(-)
3 files changed, 64 insertions(+)
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 7b796ef..fbaca8e 100644
index a45d5b8..fda7c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3679,7 +3679,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(winegstreamer)
WINE_CONFIG_DLL(winehid.sys)
WINE_CONFIG_DLL(winejoystick.drv)
@@ -3804,6 +3804,7 @@ WINE_CONFIG_MAKEFILE(dlls/winebus.sys)
WINE_CONFIG_MAKEFILE(dlls/winecoreaudio.drv)
WINE_CONFIG_MAKEFILE(dlls/winecrt0)
WINE_CONFIG_MAKEFILE(dlls/wined3d)
+WINE_CONFIG_MAKEFILE(dlls/wined3d-csmt)
WINE_CONFIG_MAKEFILE(dlls/winegstreamer)
WINE_CONFIG_MAKEFILE(dlls/winehid.sys)
WINE_CONFIG_MAKEFILE(dlls/winejoystick.drv)
diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in
new file mode 100644
index 0000000..1d0458e