Author: tkreuzer Date: Sat May 14 12:28:40 2011 New Revision: 51728
URL: http://svn.reactos.org/svn/reactos?rev=51728&view=rev Log: [AVIFIL32] Merge resources back into 1 file
Removed: trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/rsrc.rc
Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil32... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Sat May 14 12:28:40 2011 @@ -20,7 +20,6 @@ <file>tmpfile.c</file> <file>wavfile.c</file> <file>rsrc.rc</file> - <file>rsrc-utf8.rc</file> <library>wine</library> <library>uuid</library> <library>msacm32</library>
Removed: trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc-utf... ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc-utf8.rc (removed) @@ -1,50 +1,0 @@ -/* - * Top level resource file for avifil32.dll - * - * Copyright 2002 Michael Günnewig - * - * 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 - */ - -#include "avifile_private.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine AVI file support library" -#define WINE_FILENAME_STR "avifil32.dll" -#define WINE_FILEVERSION 4,0,3,1998 -#define WINE_FILEVERSION_STR "4.03.1998" - -#include "wine/wine_common_ver.rc" - -/* - * Everything specific to any language goes - * in one of the specific files. - */ - -/* UTF-8 */ -#include "avifile_Bg.rc" -#include "avifile_Da.rc" -#include "avifile_De.rc" -#include "avifile_Fr.rc" -#include "avifile_Ja.rc" -#include "avifile_Ko.rc" -#include "avifile_Lt.rc" -#include "avifile_Pt.rc" -#include "avifile_Ro.rc" -#include "avifile_Ru.rc" -#include "avifile_Si.rc" -#include "avifile_Zh.rc"
Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc?... ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Sat May 14 12:28:40 2011 @@ -29,6 +29,7 @@ #define WINE_FILEVERSION_STR "4.03.1998"
#include "wine/wine_common_ver.rc" +#include "avifile_private.h"
/* * Everything specific to any language goes @@ -46,3 +47,16 @@ #include "avifile_Tr.rc" #include "avifile_Uk.rc"
+/* UTF-8 */ +#include "avifile_Da.rc" +#include "avifile_De.rc" +#include "avifile_Fr.rc" +#include "avifile_Ja.rc" +#include "avifile_Ko.rc" +#include "avifile_Lt.rc" +#include "avifile_Pt.rc" +#include "avifile_Ro.rc" +#include "avifile_Ru.rc" +#include "avifile_Si.rc" +#include "avifile_Zh.rc" +#include "avifile_Bg.rc"