Rebase against f53c320f04114253955b509da294ef454864679d.

This commit is contained in:
Sebastian Lackner
2016-09-07 17:58:48 +02:00
parent 82a0709ef2
commit b3a71a8918
5 changed files with 26 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
From 77b33ddf4f55a309c42a137f4a27c3f8726e7442 Mon Sep 17 00:00:00 2001
From 075a73bb6277b9d3968cdb451cb5ae72573c052d 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.
@@ -12,11 +12,11 @@ Subject: wined3d: Add second dll with STAGING_CSMT definition set.
create mode 100644 dlls/wined3d-csmt/version.rc
diff --git a/configure.ac b/configure.ac
index e5fb209..7394424 100644
index cc98f4f..5fc75a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3318,6 +3318,7 @@ WINE_CONFIG_TEST(dlls/windowscodecsext/tests)
WINE_CONFIG_DLL(winealsa.drv)
@@ -3375,6 +3375,7 @@ WINE_CONFIG_DLL(winealsa.drv)
WINE_CONFIG_DLL(winebus.sys)
WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0)
+WINE_CONFIG_DLL(wined3d-csmt)