wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch
View File

@ -1,4 +1,4 @@
From 094c56e89abefa4d2d4064991b360bebd13be1eb Mon Sep 17 00:00:00 2001
From 07350060c944e605824dc4a849bf320e5a41ab32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Feb 2015 06:10:26 +0100
Subject: [PATCH] nvencodeapi: First implementation.
@ -21,18 +21,18 @@ Subject: [PATCH] nvencodeapi: First implementation.
create mode 100644 include/nvencodeapi.h
diff --git a/configure.ac b/configure.ac
index 70f9486..59d392a 100644
index d1367f4..40f96df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3555,6 +3555,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64)
WINE_CONFIG_DLL(nvcuda)
WINE_CONFIG_TEST(dlls/nvcuda/tests)
WINE_CONFIG_DLL(nvcuvid)
+WINE_CONFIG_DLL(nvencodeapi,enable_win32)
+WINE_CONFIG_DLL(nvencodeapi64,enable_win64)
WINE_CONFIG_DLL(objsel)
WINE_CONFIG_DLL(odbc32)
WINE_CONFIG_DLL(odbccp32)
@@ -3566,6 +3566,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
WINE_CONFIG_MAKEFILE(dlls/nvcuvid)
+WINE_CONFIG_MAKEFILE(dlls/nvencodeapi,enable_win32)
+WINE_CONFIG_MAKEFILE(dlls/nvencodeapi64,enable_win64)
WINE_CONFIG_MAKEFILE(dlls/objsel)
WINE_CONFIG_MAKEFILE(dlls/odbc32)
WINE_CONFIG_MAKEFILE(dlls/odbccp32)
diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
new file mode 100644
index 0000000..a2e58ac