Module: wine Branch: master Commit: 313dd0c3a4ba1fd9576820c2adb508f7204d2bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=313dd0c3a4ba1fd9576820c2ad...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jul 3 01:36:00 2009 +0200
oleview: Build language resource files separately.
Do not include them from an other rc file.
---
programs/oleview/Da.rc | 2 ++ programs/oleview/De.rc | 2 ++ programs/oleview/En.rc | 2 ++ programs/oleview/Fr.rc | 2 ++ programs/oleview/Ja.rc | 4 ++-- programs/oleview/Ko.rc | 2 ++ programs/oleview/Lt.rc | 4 ++-- programs/oleview/Makefile.in | 17 ++++++++++++++++- programs/oleview/Nl.rc | 2 ++ programs/oleview/No.rc | 2 ++ programs/oleview/Pl.rc | 2 ++ programs/oleview/Pt.rc | 2 ++ programs/oleview/Ru.rc | 2 ++ programs/oleview/Sv.rc | 2 ++ programs/oleview/Zh.rc | 4 ++-- programs/oleview/resource.h | 3 +++ programs/oleview/rsrc.rc | 18 ------------------ 17 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/programs/oleview/Da.rc b/programs/oleview/Da.rc index 02058f6..04b46e4 100644 --- a/programs/oleview/Da.rc +++ b/programs/oleview/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
IDM_MENU MENU diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index d010596..8e67cb4 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDM_MENU MENU diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 700e1d7..36dfada 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDM_MENU MENU diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index 56d7250..728f451 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDM_MENU MENU diff --git a/programs/oleview/Ja.rc b/programs/oleview/Ja.rc index 955174c..8ed1eac 100644 --- a/programs/oleview/Ja.rc +++ b/programs/oleview/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -214,5 +216,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index e1d61a9..0df4e7f 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
IDM_MENU MENU diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc index ab887c2..a5d131c 100644 --- a/programs/oleview/Lt.rc +++ b/programs/oleview/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* UTF-8 */ #pragma code_page(65001)
@@ -214,5 +216,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax()", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2c69eda..d1dad43 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -15,7 +15,22 @@ C_SRCS = \ tree.c \ typelib.c
-RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Sv.rc \ + Zh.rc \ + rsrc.rc
@MAKE_PROG_RULES@
diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc index ed2821d..6e109af 100644 --- a/programs/oleview/Nl.rc +++ b/programs/oleview/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDM_MENU MENU diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc index f5e885a..5aecd77 100644 --- a/programs/oleview/No.rc +++ b/programs/oleview/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
IDM_MENU MENU diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc index 77a0f8a..d3be5b3 100644 --- a/programs/oleview/Pl.rc +++ b/programs/oleview/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDM_MENU MENU diff --git a/programs/oleview/Pt.rc b/programs/oleview/Pt.rc index d520f49..dfc7aba 100644 --- a/programs/oleview/Pt.rc +++ b/programs/oleview/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
IDM_MENU MENU diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc index cf63d75..ab8f6b6 100644 --- a/programs/oleview/Ru.rc +++ b/programs/oleview/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN
IDM_MENU MENU diff --git a/programs/oleview/Sv.rc b/programs/oleview/Sv.rc index ed121f1..be9c053 100644 --- a/programs/oleview/Sv.rc +++ b/programs/oleview/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDM_MENU MENU diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 8f9b59c..4d0f712 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001)
@@ -406,5 +408,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "獲取最大(&G)", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index e88ec05..9e732e6 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <windef.h> +#include <winuser.h> + #define IDS_APPNAME 1 #define IDS_APPTITLE 2 #define IDM_MENU 3 diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 14122b7..20537f3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -18,26 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <windef.h> -#include <winuser.h> - #include "resource.h"
-#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Sv.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDA_OLEVIEW ACCELERATORS DISCARDABLE