wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

wined3d-CSMT_Helper: Add warning that CSMT patchset is disabled.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-21 16:25:32 +01:00
parent 24bb0ab018
commit 4e02a7a17b
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/patchinstall.sh
View File

@ -7069,12 +7069,14 @@ fi
# | resource_map
# |
# | Modified files:
# | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc
# | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc, dlls/wined3d/wined3d_main.c
# |
if test "$enable_wined3d_CSMT_Helper" -eq 1; then
patch_apply wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch
patch_apply wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch
patch_apply wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch
(
echo '+ { "Sebastian Lackner", "wined3d: Add second dll with STAGING_CSMT definition set.", 1 },';
echo '+ { "Sebastian Lackner", "wined3d: Add warning that CSMT patchset is disabled.", 1 },';
) >> "$patchlist"
fi

0
patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch → patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch
View File

28
patches/wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch Normal file
View File

@ -0,0 +1,28 @@
From 351506a226133691c2dac3e83e964b304b5ddd90 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 21 Mar 2016 16:23:21 +0100
Subject: wined3d: Add warning that CSMT patchset is disabled.
---
dlls/wined3d/wined3d_main.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index fdb260e..d5c307e 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -327,6 +327,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
}
}
+#if defined(STAGING_CSMT)
+ FIXME_(winediag)("Please note that the experimental wined3d CSMT patchset has been disabled in this\n");
+ FIXME_(winediag)("version of Wine Staging. Check out the release notes for further information.\n");
+#endif /* STAGING_CSMT */
+
if (appkey) RegCloseKey( appkey );
if (hkey) RegCloseKey( hkey );
--
2.7.1