Rebase against 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c.

This commit is contained in:
Sebastian Lackner
2016-08-02 03:35:23 +02:00
parent 0b0ad0faa4
commit b5a323aaa3
14 changed files with 587 additions and 756 deletions

View File

@@ -1,13 +1,13 @@
From 437012ece4738ad5cea694b2a6c2759927074ebe Mon Sep 17 00:00:00 2001
From 77b33ddf4f55a309c42a137f4a27c3f8726e7442 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.
---
configure.ac | 1 +
dlls/wined3d-csmt/Makefile.in | 38 ++++++++++++++++++++++++++++++++++++++
dlls/wined3d-csmt/Makefile.in | 37 +++++++++++++++++++++++++++++++++++++
dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++
3 files changed, 66 insertions(+)
3 files changed, 65 insertions(+)
create mode 100644 dlls/wined3d-csmt/Makefile.in
create mode 100644 dlls/wined3d-csmt/version.rc
@@ -25,10 +25,10 @@ index e5fb209..7394424 100644
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..3a401a0
index 0000000..bf064ed
--- /dev/null
+++ b/dlls/wined3d-csmt/Makefile.in
@@ -0,0 +1,38 @@
@@ -0,0 +1,37 @@
+EXTRADEFS = -DSTAGING_CSMT
+MODULE = wined3d-csmt.dll
+IMPORTS = uuid opengl32 user32 gdi32 advapi32
@@ -63,13 +63,12 @@ index 0000000..3a401a0
+ utils.c \
+ vertexdeclaration.c \
+ view.c \
+ volume.c \
+ wined3d_main.c
+
+RC_SRCS = version.rc
diff --git a/dlls/wined3d-csmt/version.rc b/dlls/wined3d-csmt/version.rc
new file mode 100644
index 0000000..0439375
index 0000000..2fa8710
--- /dev/null
+++ b/dlls/wined3d-csmt/version.rc
@@ -0,0 +1,27 @@
@@ -101,5 +100,5 @@ index 0000000..0439375
+
+#include "wine/wine_common_ver.rc"
--
2.1.3
2.9.0