msvidc32: Build language resource files separately. Do not include them from an other rc file.
diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 3f9be06..faa0f18 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in
@@ -8,7 +8,23 @@ C_SRCS = \ msvideo1.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvidc32_Da.rc \ + msvidc32_De.rc \ + msvidc32_En.rc \ + msvidc32_Fr.rc \ + msvidc32_Hu.rc \ + msvidc32_Ko.rc \ + msvidc32_Lt.rc \ + msvidc32_Nl.rc \ + msvidc32_No.rc \ + msvidc32_Pl.rc \ + msvidc32_Pt.rc \ + msvidc32_Ro.rc \ + msvidc32_Ru.rc \ + msvidc32_Si.rc \ + msvidc32_Sv.rc \ + msvidc32_Tr.rc @MAKE_DLL_RULES@
diff --git a/dlls/msvidc32/msvidc32_Da.rc b/dlls/msvidc32/msvidc32_Da.rc index 50ae3f6..0b28606 100644 --- a/dlls/msvidc32/msvidc32_Da.rc +++ b/dlls/msvidc32/msvidc32_Da.rc
@@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_De.rc b/dlls/msvidc32/msvidc32_De.rc index 1d0de70..c31635c 100644 --- a/dlls/msvidc32/msvidc32_De.rc +++ b/dlls/msvidc32/msvidc32_De.rc
@@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_En.rc b/dlls/msvidc32/msvidc32_En.rc index 93c8518..8ac6b59 100644 --- a/dlls/msvidc32/msvidc32_En.rc +++ b/dlls/msvidc32/msvidc32_En.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index 3592f31..b250deb 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Hu.rc b/dlls/msvidc32/msvidc32_Hu.rc index c031963..2949bae 100644 --- a/dlls/msvidc32/msvidc32_Hu.rc +++ b/dlls/msvidc32/msvidc32_Hu.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Ko.rc b/dlls/msvidc32/msvidc32_Ko.rc index 11c18c1..e95cc94 100644 --- a/dlls/msvidc32/msvidc32_Ko.rc +++ b/dlls/msvidc32/msvidc32_Ko.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Lt.rc b/dlls/msvidc32/msvidc32_Lt.rc index f83bce3..ee75ead 100644 --- a/dlls/msvidc32/msvidc32_Lt.rc +++ b/dlls/msvidc32/msvidc32_Lt.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -26,5 +28,3 @@ IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 vaizdo kodekas" } - -#pragma code_page(default)
diff --git a/dlls/msvidc32/msvidc32_Nl.rc b/dlls/msvidc32/msvidc32_Nl.rc index b68d3ef..c11ca47 100644 --- a/dlls/msvidc32/msvidc32_Nl.rc +++ b/dlls/msvidc32/msvidc32_Nl.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_No.rc b/dlls/msvidc32/msvidc32_No.rc index 6d27778..fa2a96f 100644 --- a/dlls/msvidc32/msvidc32_No.rc +++ b/dlls/msvidc32/msvidc32_No.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Pl.rc b/dlls/msvidc32/msvidc32_Pl.rc index af39271..221c41e 100644 --- a/dlls/msvidc32/msvidc32_Pl.rc +++ b/dlls/msvidc32/msvidc32_Pl.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Pt.rc b/dlls/msvidc32/msvidc32_Pt.rc index 8dcda92..ee0eed4 100644 --- a/dlls/msvidc32/msvidc32_Pt.rc +++ b/dlls/msvidc32/msvidc32_Pt.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc index fa7584a..62bcef0 100644 --- a/dlls/msvidc32/msvidc32_Ro.rc +++ b/dlls/msvidc32/msvidc32_Ro.rc
@@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Ru.rc b/dlls/msvidc32/msvidc32_Ru.rc index 2c84bff..1f1adc5 100644 --- a/dlls/msvidc32/msvidc32_Ru.rc +++ b/dlls/msvidc32/msvidc32_Ru.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc index 060ad08..19d392fc 100644 --- a/dlls/msvidc32/msvidc32_Si.rc +++ b/dlls/msvidc32/msvidc32_Si.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 video kodek" } - -#pragma code_page(default)
diff --git a/dlls/msvidc32/msvidc32_Sv.rc b/dlls/msvidc32/msvidc32_Sv.rc index 1f4770d..7c9b0bc 100644 --- a/dlls/msvidc32/msvidc32_Sv.rc +++ b/dlls/msvidc32/msvidc32_Sv.rc
@@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_Tr.rc b/dlls/msvidc32/msvidc32_Tr.rc index 2353b0c..d4b882b 100644 --- a/dlls/msvidc32/msvidc32_Tr.rc +++ b/dlls/msvidc32/msvidc32_Tr.rc
@@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvidc32_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE
diff --git a/dlls/msvidc32/msvidc32_private.h b/dlls/msvidc32/msvidc32_private.h index b47c6e6..590600e 100644 --- a/dlls/msvidc32/msvidc32_private.h +++ b/dlls/msvidc32/msvidc32_private.h
@@ -19,6 +19,8 @@ #ifndef __MSVIDC32_PRIVATE_H #define __MSVIDC32_PRIVATE_H +#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101
diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc deleted file mode 100644 index 68c8dbf..0000000 --- a/dlls/msvidc32/rsrc.rc +++ /dev/null
@@ -1,37 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 "windef.h" -#include "msvidc32_private.h" - -#include "msvidc32_Da.rc" -#include "msvidc32_De.rc" -#include "msvidc32_Fr.rc" -#include "msvidc32_En.rc" -#include "msvidc32_Hu.rc" -#include "msvidc32_Ko.rc" -#include "msvidc32_Lt.rc" -#include "msvidc32_Nl.rc" -#include "msvidc32_No.rc" -#include "msvidc32_Pl.rc" -#include "msvidc32_Pt.rc" -#include "msvidc32_Ro.rc" -#include "msvidc32_Ru.rc" -#include "msvidc32_Si.rc" -#include "msvidc32_Sv.rc" -#include "msvidc32_Tr.rc"