Module: wine Branch: master Commit: 25764235f9445d6d4554adceb0f2688e688c3d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25764235f9445d6d4554adceb0...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jul 3 12:16:59 2009 +0200
urlmon: Import the version.rc into the main rc file.
There is no need for a separate file.
---
dlls/urlmon/rsrc.rc | 8 +++++++- dlls/urlmon/version.rc | 27 --------------------------- 2 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/dlls/urlmon/rsrc.rc b/dlls/urlmon/rsrc.rc index d71b2fa..c87ea81 100644 --- a/dlls/urlmon/rsrc.rc +++ b/dlls/urlmon/rsrc.rc @@ -19,4 +19,10 @@ /* @makedep: urlmon.inf */ REGINST REGINST urlmon.inf
-#include "version.rc" +#define WINE_FILENAME_STR "urlmon.dll" +#define WINE_FILEVERSION 6,0,2800,1485 +#define WINE_FILEVERSION_STR "6.0.2800.1485" +#define WINE_PRODUCTVERSION 6,0,2800,1485 +#define WINE_PRODUCTVERSION_STR "6.0.2800.1485" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/urlmon/version.rc b/dlls/urlmon/version.rc deleted file mode 100644 index 10cc721..0000000 --- a/dlls/urlmon/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005 - * - * Stefan Leichter - * - * 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 - */ - -#define WINE_FILENAME_STR "urlmon.dll" -#define WINE_FILEVERSION 6,0,2800,1485 -#define WINE_FILEVERSION_STR "6.0.2800.1485" -#define WINE_PRODUCTVERSION 6,0,2800,1485 -#define WINE_PRODUCTVERSION_STR "6.0.2800.1485" - -#include "wine/wine_common_ver.rc"