Module: wine Branch: master Commit: 7caa127746fd880a263715879c9931fa67053fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7caa127746fd880a263715879...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 11 11:04:40 2020 +0100
wineusb.sys: Move wineusb.inf into the module resources.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wineusb.sys/Makefile.in | 2 ++ .../wineusb.inf.in => dlls/wineusb.sys/wineusb.inf | 0 dlls/wineusb.sys/wineusb.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 3 +-- loader/wine.inf.in | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index bac79f668e8..12441435eeb 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -6,3 +6,5 @@ EXTRADLLFLAGS = -Wl,--subsystem,native
C_SRCS = \ wineusb.c + +RC_SRCS = wineusb.rc diff --git a/loader/wineusb.inf.in b/dlls/wineusb.sys/wineusb.inf similarity index 100% rename from loader/wineusb.inf.in rename to dlls/wineusb.sys/wineusb.inf diff --git a/dlls/wineusb.sys/wineusb.rc b/dlls/wineusb.sys/wineusb.rc new file mode 100644 index 00000000000..f70eb0c6926 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wineusb.inf */ +1 WINE_DATA_FILE wineusb.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index 99d4a8349e8..7302c231915 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -8,8 +8,7 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in \ - wineusb.inf.in + wine_info.plist.in
PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c273a2f2821..da21245954e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4061,7 +4061,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" -wineusb.inf +wineusb.inf,"@wineusb.sys,-1"
[NlsFiles] c_037.nls