Module: wine Branch: master Commit: 58d49b42c945dcc1dc2f239d6527a315a80f02fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d49b42c945dcc1dc2f239d65...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jun 30 11:09:31 2009 +0200
iccvid: Build language resource files separately.
Instead of including them from an other rc file.
---
dlls/iccvid/Makefile.in | 18 +++++++++++++++++- dlls/iccvid/iccvid_Da.rc | 2 ++ dlls/iccvid/iccvid_De.rc | 2 ++ dlls/iccvid/iccvid_En.rc | 2 ++ dlls/iccvid/iccvid_Fr.rc | 2 ++ dlls/iccvid/iccvid_Hu.rc | 2 ++ dlls/iccvid/iccvid_Ko.rc | 2 ++ dlls/iccvid/iccvid_Lt.rc | 4 ++-- dlls/iccvid/iccvid_Nl.rc | 2 ++ dlls/iccvid/iccvid_No.rc | 2 ++ dlls/iccvid/iccvid_Pl.rc | 2 ++ dlls/iccvid/iccvid_Pt.rc | 2 ++ dlls/iccvid/iccvid_Ro.rc | 2 ++ dlls/iccvid/iccvid_Ru.rc | 2 ++ dlls/iccvid/iccvid_Si.rc | 4 ++-- dlls/iccvid/iccvid_Sv.rc | 2 ++ dlls/iccvid/iccvid_Tr.rc | 2 ++ dlls/iccvid/iccvid_private.h | 2 ++ dlls/iccvid/rsrc.rc | 37 ------------------------------------- 19 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index c81a913..1a2fd75 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = user32 kernel32 C_SRCS = \ iccvid.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + iccvid_Da.rc \ + iccvid_De.rc \ + iccvid_En.rc \ + iccvid_Fr.rc \ + iccvid_Hu.rc \ + iccvid_Ko.rc \ + iccvid_Lt.rc \ + iccvid_Nl.rc \ + iccvid_No.rc \ + iccvid_Pl.rc \ + iccvid_Pt.rc \ + iccvid_Ro.rc \ + iccvid_Ru.rc \ + iccvid_Si.rc \ + iccvid_Sv.rc \ + iccvid_Tr.rc
@MAKE_DLL_RULES@
diff --git a/dlls/iccvid/iccvid_Da.rc b/dlls/iccvid/iccvid_Da.rc index 185b1bb..bbdc03e 100644 --- a/dlls/iccvid/iccvid_Da.rc +++ b/dlls/iccvid/iccvid_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_De.rc b/dlls/iccvid/iccvid_De.rc index c101f3a..3262c91 100644 --- a/dlls/iccvid/iccvid_De.rc +++ b/dlls/iccvid/iccvid_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_En.rc b/dlls/iccvid/iccvid_En.rc index c71b0a4..91d848a 100644 --- a/dlls/iccvid/iccvid_En.rc +++ b/dlls/iccvid/iccvid_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Fr.rc b/dlls/iccvid/iccvid_Fr.rc index 4d276e6..f3862be 100644 --- a/dlls/iccvid/iccvid_Fr.rc +++ b/dlls/iccvid/iccvid_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Hu.rc b/dlls/iccvid/iccvid_Hu.rc index b24cf8e..69faccd 100644 --- a/dlls/iccvid/iccvid_Hu.rc +++ b/dlls/iccvid/iccvid_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ko.rc b/dlls/iccvid/iccvid_Ko.rc index 0cfbe3e..f47eb8c 100644 --- a/dlls/iccvid/iccvid_Ko.rc +++ b/dlls/iccvid/iccvid_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Lt.rc b/dlls/iccvid/iccvid_Lt.rc index b5157e8..2e31cd3 100644 --- a/dlls/iccvid/iccvid_Lt.rc +++ b/dlls/iccvid/iccvid_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "Cinepak vaizdo kodekas" IDS_DESCRIPTION "Cinepak vaizdo kodekas" } - -#pragma code_page(default) diff --git a/dlls/iccvid/iccvid_Nl.rc b/dlls/iccvid/iccvid_Nl.rc index 0c58dd1..fbc4024 100644 --- a/dlls/iccvid/iccvid_Nl.rc +++ b/dlls/iccvid/iccvid_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_No.rc b/dlls/iccvid/iccvid_No.rc index dd64108..4cefc00 100644 --- a/dlls/iccvid/iccvid_No.rc +++ b/dlls/iccvid/iccvid_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Pl.rc b/dlls/iccvid/iccvid_Pl.rc index e276e87..0a4c0f5 100644 --- a/dlls/iccvid/iccvid_Pl.rc +++ b/dlls/iccvid/iccvid_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Pt.rc b/dlls/iccvid/iccvid_Pt.rc index 5e4ad5c..659224f 100644 --- a/dlls/iccvid/iccvid_Pt.rc +++ b/dlls/iccvid/iccvid_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ro.rc b/dlls/iccvid/iccvid_Ro.rc index 85cb1da..ccd8ef7 100644 --- a/dlls/iccvid/iccvid_Ro.rc +++ b/dlls/iccvid/iccvid_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc index c78ee72..01bbec0 100644 --- a/dlls/iccvid/iccvid_Ru.rc +++ b/dlls/iccvid/iccvid_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Si.rc b/dlls/iccvid/iccvid_Si.rc index 82bbd05..9635480 100644 --- a/dlls/iccvid/iccvid_Si.rc +++ b/dlls/iccvid/iccvid_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + #pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "Cinepak Video kodek" IDS_DESCRIPTION "Cinepak Video kodek" } - -#pragma code_page(default) diff --git a/dlls/iccvid/iccvid_Sv.rc b/dlls/iccvid/iccvid_Sv.rc index 55eb468..34762d6 100644 --- a/dlls/iccvid/iccvid_Sv.rc +++ b/dlls/iccvid/iccvid_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Tr.rc b/dlls/iccvid/iccvid_Tr.rc index 929f44f..8eabf9f 100644 --- a/dlls/iccvid/iccvid_Tr.rc +++ b/dlls/iccvid/iccvid_Tr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "iccvid_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_private.h b/dlls/iccvid/iccvid_private.h index 8400e77..56b082d 100644 --- a/dlls/iccvid/iccvid_private.h +++ b/dlls/iccvid/iccvid_private.h @@ -19,6 +19,8 @@ #ifndef __ICCVID_PRIVATE_H #define __ICCVID_PRIVATE_H
+#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101
diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc deleted file mode 100644 index 6a1955c..0000000 --- a/dlls/iccvid/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 "iccvid_private.h" - -#include "iccvid_Da.rc" -#include "iccvid_De.rc" -#include "iccvid_En.rc" -#include "iccvid_Fr.rc" -#include "iccvid_Hu.rc" -#include "iccvid_Ko.rc" -#include "iccvid_Lt.rc" -#include "iccvid_Nl.rc" -#include "iccvid_No.rc" -#include "iccvid_Pl.rc" -#include "iccvid_Pt.rc" -#include "iccvid_Ro.rc" -#include "iccvid_Ru.rc" -#include "iccvid_Si.rc" -#include "iccvid_Sv.rc" -#include "iccvid_Tr.rc"
-
Alexandre Julliard