You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 75d82d2ec02b8cef45c942e677824e5df4ddf135 Mon Sep 17 00:00:00 2001
|
||||
From 40cf610272e52f68631e9292342e1d020735b6a4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 5 Jan 2015 18:11:53 +0100
|
||||
Subject: [PATCH] nvapi: First implementation.
|
||||
@@ -25,10 +25,10 @@ Subject: [PATCH] nvapi: First implementation.
|
||||
create mode 100644 include/nvapi.h
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 87c507a..ce47cd0 100644
|
||||
index 55d8931..fbf0cce 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -215,6 +215,12 @@ esac
|
||||
@@ -216,6 +216,12 @@ esac
|
||||
dnl enable_win16 defaults to yes on x86, to no on other CPUs
|
||||
enable_win16=${enable_win16:-no}
|
||||
enable_win64=${enable_win64:-no}
|
||||
@@ -41,16 +41,16 @@ index 87c507a..ce47cd0 100644
|
||||
|
||||
dnl Disable winetest too if tests are disabled
|
||||
enable_winetest=${enable_winetest:-$enable_tests}
|
||||
@@ -3543,6 +3549,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
|
||||
WINE_CONFIG_DLL(ntoskrnl.exe)
|
||||
WINE_CONFIG_DLL(ntprint)
|
||||
WINE_CONFIG_TEST(dlls/ntprint/tests)
|
||||
+WINE_CONFIG_DLL(nvapi,enable_win32)
|
||||
+WINE_CONFIG_TEST(dlls/nvapi/tests)
|
||||
+WINE_CONFIG_DLL(nvapi64,enable_win64)
|
||||
WINE_CONFIG_DLL(nvcuda)
|
||||
WINE_CONFIG_TEST(dlls/nvcuda/tests)
|
||||
WINE_CONFIG_DLL(objsel)
|
||||
@@ -3554,6 +3560,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntdsapi/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ntprint)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/nvapi,enable_win32)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda)
|
||||
WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/objsel)
|
||||
diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..606177f
|
||||
|
Reference in New Issue
Block a user