Rebase against 7ce384c4153112201aa263da6dee15fed21a4e06.

This commit is contained in:
Sebastian Lackner
2016-10-14 23:49:07 +02:00
parent 0f6b6615d9
commit 70bc9a4e63
4 changed files with 18 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
From 075a73bb6277b9d3968cdb451cb5ae72573c052d Mon Sep 17 00:00:00 2001
From 067858d5fc5eedfd513b38cd4ed2c69a1b1d1270 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,17 +12,17 @@ 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 cc98f4f..5fc75a7 100644
index 1ff19c4..bf2414d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3375,6 +3375,7 @@ WINE_CONFIG_DLL(winealsa.drv)
@@ -3424,6 +3424,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)
WINE_CONFIG_DLL(wined3d,,[implib])
WINE_CONFIG_DLL(winegstreamer)
WINE_CONFIG_DLL(winejoystick.drv)
WINE_CONFIG_DLL(winehid.sys)
diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in
new file mode 100644
index 0000000..bf064ed