From 862fcd5db2f09d433141293066c914b4291684a5 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 6 Feb 2016 10:44:28 +0900 Subject: [PATCH] Make Merge.rc editable by Visual Studio --- Src/Merge.rc | 10 ---------- Translations/WinMerge/CreateMasterPotFile.vbs | 1 - 2 files changed, 11 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 0f6c9f59a..a8093d7b7 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -51,11 +51,9 @@ BEGIN "LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r\n" "#pragma code_page(1252)\r\n" "#endif\r\n" - "#ifdef _AFXDLL\r\n" "#include ""res\\Merge.rc2"" // non-Microsoft Visual C++ edited resources\r\n" "#include ""afxres.rc"" // Standard components\r\n" "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#endif\r\n" "#endif\0" END @@ -2823,12 +2821,6 @@ BEGIN IDS_FRHED_NOTINSTALLED "frhed(http://frhed.sourceforge.net/) not installed" END -#ifndef _AFXDLL -#include "res\Merge.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#include "afxprint.rc" // printing/print preview resources -#endif - // END STRINGS SYNCHRO #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -2849,11 +2841,9 @@ END LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif -#ifdef _AFXDLL #include "res\Merge.rc2" // non-Microsoft Visual C++ edited resources #include "afxres.rc" // Standard components #include "afxprint.rc" // printing/print preview resources #endif -#endif ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/Translations/WinMerge/CreateMasterPotFile.vbs b/Translations/WinMerge/CreateMasterPotFile.vbs index e3de1e135..8aa2b113c 100644 --- a/Translations/WinMerge/CreateMasterPotFile.vbs +++ b/Translations/WinMerge/CreateMasterPotFile.vbs @@ -215,7 +215,6 @@ Function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage) oStrings.Add sContext & sString, oString End If End If - If sLine = "#ifndef APSTUDIO_INVOKED" Then Exit Do oLcFile.WriteLine sLcLine fContinuation = sLine <> "" And InStr(",|", Right(sLine, 1)) <> 0 Loop -- 2.11.0