You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2010-11-12 08:13:28
|
Revision: 7419
http://winmerge.svn.sourceforge.net/winmerge/?rev=7419&view=rev
Author: gerundt
Date: 2010-11-12 08:13:22 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
PATCH: [ 2923684 ] GUI Language update
Fixes bug #2808178
Submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/ChildFrm.cpp
branches/R2_14/Src/DiffViewBar.cpp
branches/R2_14/Src/DiffViewBar.h
branches/R2_14/Src/LocationBar.cpp
branches/R2_14/Src/LocationBar.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-12 08:13:22 UTC (rev 7419)
@@ -17,6 +17,7 @@
Allow setting codepage from command line (#2725549)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
+ Bugfix: Pane headers not updated after language change (#2923684)
WinMerge 2.13.20 - 2010-10-20 (r7319)
Add missing keywords to Pascal highlighter (#2834192)
Modified: branches/R2_14/Src/ChildFrm.cpp
===================================================================
--- branches/R2_14/Src/ChildFrm.cpp 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/ChildFrm.cpp 2010-11-12 08:13:22 UTC (rev 7419)
@@ -767,6 +767,8 @@
{
m_leftStatus.UpdateResources();
m_rightStatus.UpdateResources();
+ m_wndLocationBar.UpdateResources();
+ m_wndDetailBar.UpdateResources();
}
/**
Modified: branches/R2_14/Src/DiffViewBar.cpp
===================================================================
--- branches/R2_14/Src/DiffViewBar.cpp 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/DiffViewBar.cpp 2010-11-12 08:13:22 UTC (rev 7419)
@@ -11,6 +11,7 @@
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
+#include "Merge.h"
#include "ChildFrm.h"
#include "DiffViewBar.h"
@@ -159,3 +160,11 @@
{
m_hwndFrame = hwndFrame;
}
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CDiffViewBar::UpdateResources()
+{
+ String sCaption = theApp.LoadString(IDS_DIFFBAR_CAPTION);
+ SetWindowText(sCaption.c_str());
+}
Modified: branches/R2_14/Src/DiffViewBar.h
===================================================================
--- branches/R2_14/Src/DiffViewBar.h 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/DiffViewBar.h 2010-11-12 08:13:22 UTC (rev 7419)
@@ -38,6 +38,7 @@
int GetPanelHeight();
void UpdateBarHeight(int DiffPanelHeight);
void SetFrameHwnd(HWND hwndFrame);
+ void UpdateResources();
protected:
CSplitterWndEx * m_pwndDetailSplitter;
Modified: branches/R2_14/Src/LocationBar.cpp
===================================================================
--- branches/R2_14/Src/LocationBar.cpp 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/LocationBar.cpp 2010-11-12 08:13:22 UTC (rev 7419)
@@ -125,3 +125,11 @@
{
m_hwndFrame = hwndFrame;
}
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CLocationBar::UpdateResources()
+{
+ String sCaption = theApp.LoadString(IDS_LOCBAR_CAPTION);
+ SetWindowText(sCaption.c_str());
+}
Modified: branches/R2_14/Src/LocationBar.h
===================================================================
--- branches/R2_14/Src/LocationBar.h 2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/LocationBar.h 2010-11-12 08:13:22 UTC (rev 7419)
@@ -34,7 +34,7 @@
UINT nID = AFX_IDW_PANE_FIRST);
void SetFrameHwnd(HWND hwndFrame);
-
+ void UpdateResources();
protected:
// Overrides
// ClassWizard generated virtual function overrides
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-11 12:22:49
|
Revision: 7418
http://winmerge.svn.sourceforge.net/winmerge/?rev=7418&view=rev
Author: gerundt
Date: 2010-11-11 12:22:43 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
Fix some whitespaces in R2_14
Modified Paths:
--------------
branches/R2_14/Src/DiffList.cpp
branches/R2_14/Src/DirDoc.cpp
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/FolderCmp.cpp
branches/R2_14/Src/LocationView.cpp
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/DiffList.cpp
===================================================================
--- branches/R2_14/Src/DiffList.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/DiffList.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -467,7 +467,8 @@
*/
const DIFFRANGE * DiffList::FirstSignificantDiffRange() const
{
- if (m_firstSignificant == -1) return NULL;
+ if (m_firstSignificant == -1)
+ return NULL;
return DiffRangeAt(m_firstSignificant);
}
@@ -477,7 +478,8 @@
*/
const DIFFRANGE * DiffList::LastSignificantDiffRange() const
{
- if (m_lastSignificant == -1) return NULL;
+ if (m_lastSignificant == -1)
+ return NULL;
return DiffRangeAt(m_lastSignificant);
}
Modified: branches/R2_14/Src/DirDoc.cpp
===================================================================
--- branches/R2_14/Src/DirDoc.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/DirDoc.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -313,7 +313,8 @@
*/
void CDirDoc::Rescan()
{
- if (!m_pCtxt) return;
+ if (!m_pCtxt)
+ return;
CDirFrame *pf = m_pDirView->GetParentFrame();
@@ -435,15 +436,15 @@
// users see files appearing/disappearing without clear logic.
if (GetOptionsMgr()->GetBool(OPT_TREE_MODE))
{
- // result filters
- if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
- return FALSE;
+ // result filters
+ if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
+ return FALSE;
- // result filters
- if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL))
- return FALSE;
- if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
- return FALSE;
+ // result filters
+ if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL))
+ return FALSE;
+ if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
+ return FALSE;
}
}
}
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/DirView.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -18,7 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-/**
+/**
* @file DirView.cpp
*
* @brief Main implementation file for CDirView
Modified: branches/R2_14/Src/FolderCmp.cpp
===================================================================
--- branches/R2_14/Src/FolderCmp.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/FolderCmp.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -346,7 +346,6 @@
return code;
}
-
/**
* @brief Get actual compared paths from DIFFITEM.
* @note If item is unique, same path is returned for both.
Modified: branches/R2_14/Src/LocationView.cpp
===================================================================
--- branches/R2_14/Src/LocationView.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/LocationView.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -927,7 +927,6 @@
nBottomCoord +=iPos;
}
}
-
}
// Store current values for later use (to check if area changes)
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2010-11-11 11:06:50 UTC (rev 7417)
+++ branches/R2_14/Src/MergeDoc.cpp 2010-11-11 12:22:43 UTC (rev 7418)
@@ -2828,17 +2828,16 @@
m_pDetailView[1]->SetDlgCtrlID(nLeftDetailViewId);
// Swap buffers and so on
- swap(m_ptBuf[0], m_ptBuf[1]);
- swap(m_pView[0], m_pView[1]);
- swap(m_pDetailView[0], m_pDetailView[1]);
- swap(m_pSaveFileInfo[0], m_pSaveFileInfo[1]);
- swap(m_pRescanFileInfo[0], m_pRescanFileInfo[1]);
- swap(m_nBufferType[0], m_nBufferType[1]);
- swap(m_bEditAfterRescan[0], m_bEditAfterRescan[1]);
+ swap(m_ptBuf[0], m_ptBuf[1]);
+ swap(m_pView[0], m_pView[1]);
+ swap(m_pDetailView[0], m_pDetailView[1]);
+ swap(m_pSaveFileInfo[0], m_pSaveFileInfo[1]);
+ swap(m_pRescanFileInfo[0], m_pRescanFileInfo[1]);
+ swap(m_nBufferType[0], m_nBufferType[1]);
+ swap(m_bEditAfterRescan[0], m_bEditAfterRescan[1]);
m_strDesc[0].swap(m_strDesc[1]);
m_filePaths.Swap();
-
m_diffList.Swap();
m_ptBuf[0]->m_nThisPane = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-11 11:06:56
|
Revision: 7417
http://winmerge.svn.sourceforge.net/winmerge/?rev=7417&view=rev
Author: gerundt
Date: 2010-11-11 11:06:50 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
PATCH: [ 2725549 ] Set a codepage with command-line parameter
Submitted by bulklodd <bul...@us...>
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Docs/Users/Contributors.txt
branches/R2_14/Src/Merge.cpp
branches/R2_14/Src/MergeCmdLineInfo.cpp
branches/R2_14/Src/MergeCmdLineInfo.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-11 11:06:50 UTC (rev 7417)
@@ -14,6 +14,7 @@
Improve color options organization (#2818451)
Add /xq command line switch for closing WinMerge after identical files
and not showing message (#2827836)
+ Allow setting codepage from command line (#2725549)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt 2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Docs/Users/Contributors.txt 2010-11-11 11:06:50 UTC (rev 7417)
@@ -142,6 +142,7 @@
Other Contributors (code, ideas, testing..):
* Andre Arpin
* Steve Beaudoin
+* bulklodd <bul...@us...>
* Adam Carrivick
* Hern Chen
* Jeremy Dewey
Modified: branches/R2_14/Src/Merge.cpp
===================================================================
--- branches/R2_14/Src/Merge.cpp 2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/Merge.cpp 2010-11-11 11:06:50 UTC (rev 7417)
@@ -56,6 +56,7 @@
#include "OptionsDef.h"
#include "MergeCmdLineInfo.h"
#include "ConflictFileParser.h"
+#include "codepage.h"
// For shutdown cleanup
#include "charsets.h"
@@ -626,6 +627,12 @@
m_globalFileFilter.SetFilter(cmdInfo.m_sFileFilter.c_str());
}
+ // Set codepage.
+ if (cmdInfo.m_nCodepage)
+ {
+ updateDefaultCodepage(2,cmdInfo.m_nCodepage);
+ }
+
// Unless the user has requested to see WinMerge's usage open files for
// comparison.
if (cmdInfo.m_bShowUsage)
Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-11 11:06:50 UTC (rev 7417)
@@ -123,6 +123,7 @@
m_bNonInteractive(false),
m_bSingleInstance(false),
m_bShowUsage(false),
+ m_nCodepage(0),
m_dwLeftFlags(FFILEOPEN_CMDLINE),
m_dwRightFlags(FFILEOPEN_CMDLINE)
{
@@ -335,6 +336,12 @@
// any messages
m_bExitIfNoDiff = ExitQuiet;
}
+ else if (param == _T("cp"))
+ {
+ String codepage;
+ q = EatParam(q, codepage);
+ m_nCodepage = _ttoi(codepage.c_str());
+ }
else if (param == _T("ignorews"))
{
q = SetOption(q, OPT_CMP_IGNORE_WHITESPACE);
Modified: branches/R2_14/Src/MergeCmdLineInfo.h
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.h 2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/MergeCmdLineInfo.h 2010-11-11 11:06:50 UTC (rev 7417)
@@ -60,6 +60,7 @@
bool m_bNonInteractive; /**< Suppress user's notifications. */
bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
+ int m_nCodepage; /**< Codepage. */
DWORD m_dwLeftFlags; /**< Left side file's behavior options. */
DWORD m_dwRightFlags; /**< Right side file's behavior options. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-10 08:53:31
|
Revision: 7416
http://winmerge.svn.sourceforge.net/winmerge/?rev=7416&view=rev
Author: gerundt
Date: 2010-11-10 08:53:25 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
RFE [ 2827836 ] Auto Close if Compare is the Same
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/MainFrm.cpp
branches/R2_14/Src/MainFrm.h
branches/R2_14/Src/MergeCmdLineInfo.cpp
branches/R2_14/Src/MergeCmdLineInfo.h
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-10 08:53:25 UTC (rev 7416)
@@ -12,6 +12,8 @@
Improve editing of linefilter regular expressions (#3015416)
Allow editing context line count in patch creator (#2092180)
Improve color options organization (#2818451)
+ Add /xq command line switch for closing WinMerge after identical files
+ and not showing message (#2827836)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/Src/MainFrm.cpp
===================================================================
--- branches/R2_14/Src/MainFrm.cpp 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MainFrm.cpp 2010-11-10 08:53:25 UTC (rev 7416)
@@ -74,6 +74,7 @@
#include "FileOrFolderSelect.h"
#include "PropBackups.h"
#include "PluginsListDlg.h"
+#include "MergeCmdLineInfo.h"
/*
One source file must compile the stubs for multimonitor
@@ -274,7 +275,7 @@
, m_bFirstTime(TRUE)
, m_bEscShutdown(FALSE)
, m_bClearCaseTool(FALSE)
-, m_bExitIfNoDiff(FALSE)
+, m_bExitIfNoDiff(MergeCmdLineInfo::Disabled)
, m_bShowErrors(TRUE)
, m_CheckOutMulti(FALSE)
, m_bVCProjSync(FALSE)
Modified: branches/R2_14/Src/MainFrm.h
===================================================================
--- branches/R2_14/Src/MainFrm.h 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MainFrm.h 2010-11-10 08:53:25 UTC (rev 7416)
@@ -34,7 +34,7 @@
#include "MDITabBar.h"
#include "OptionsMgr.h"
#include "VSSHelper.h"
-struct FileLocation;
+#include "MergeCmdLineInfo.h"
/**
* @brief Flags used when opening files
@@ -83,8 +83,8 @@
class SyntaxColors;
class LineFiltersList;
class TempFile;
+struct FileLocation;
-
// typed lists (homogenous pointer lists)
typedef CTypedPtrList<CPtrList, CMergeDoc *> MergeDocList;
typedef CTypedPtrList<CPtrList, CDirDoc *> DirDocList;
@@ -177,7 +177,7 @@
SyntaxColors * GetMainSyntaxColors() { return m_pSyntaxColors; }
BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
BOOL m_bFlashing; /**< Window is flashing. */
- BOOL m_bExitIfNoDiff; /**< If command line switch -x given close application if files are identical. */
+ MergeCmdLineInfo::ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical? */
LineFiltersList *m_pLineFilters; /**< List of linefilters */
/**
Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-10 08:53:25 UTC (rev 7416)
@@ -118,7 +118,7 @@
m_nCmdShow(SW_SHOWNORMAL),
m_bClearCaseTool(false),
m_bEscShutdown(false),
- m_bExitIfNoDiff(false),
+ m_bExitIfNoDiff(Disabled),
m_bRecurse(false),
m_bNonInteractive(false),
m_bSingleInstance(false),
@@ -327,8 +327,14 @@
else if (param == _T("x"))
{
// -x to close application if files are identical.
- m_bExitIfNoDiff = true;
+ m_bExitIfNoDiff = Exit;
}
+ else if (param == _T("xq"))
+ {
+ // -xn to close application if files are identical without showing
+ // any messages
+ m_bExitIfNoDiff = ExitQuiet;
+ }
else if (param == _T("ignorews"))
{
q = SetOption(q, OPT_CMP_IGNORE_WHITESPACE);
Modified: branches/R2_14/Src/MergeCmdLineInfo.h
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.h 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeCmdLineInfo.h 2010-11-10 08:53:25 UTC (rev 7416)
@@ -44,11 +44,18 @@
public:
+ enum ExitNoDiff
+ {
+ Disabled, /**< Don't exit. */
+ Exit, /**< Exit and show message. */
+ ExitQuiet, /**< Exit and don't show message. */
+ };
+
int m_nCmdShow; /**< Initial state of the application's window. */
bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
bool m_bEscShutdown; /**< Pressing ESC will close the application */
- bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
+ ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical. */
bool m_bRecurse; /**< Include sub folder in directories compare. */
bool m_bNonInteractive; /**< Suppress user's notifications. */
bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeDoc.cpp 2010-11-10 08:53:25 UTC (rev 7416)
@@ -62,6 +62,7 @@
#include "FileOrFolderSelect.h"
#include "LineFiltersList.h"
#include "TempFile.h"
+#include "MergeCmdLineInfo.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -679,18 +680,20 @@
{
UINT nFlags = MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN;
- // Show the "files are identical" error message even if the user
- // requested not to show it again. It is better than to close
- // the application without a warning.
- if (GetMainFrame()->m_bExitIfNoDiff)
+ if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit)
{
+ // Show the "files are identical" for basic "exit no diff" flag
+ // If user don't want to see the message one uses the quiet version
+ // of the "exit no diff".
nFlags &= ~MB_DONT_DISPLAY_AGAIN;
}
- LangMessageBox(IDS_FILESSAME, nFlags);
+ if (GetMainFrame()->m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
+ LangMessageBox(IDS_FILESSAME, nFlags);
// Exit application if files are identical.
- if (GetMainFrame()->m_bExitIfNoDiff)
+ if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit ||
+ GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::ExitQuiet)
{
GetMainFrame()->PostMessage(WM_COMMAND, ID_APP_EXIT);
}
@@ -2376,7 +2379,7 @@
// Exit if files are identical should only work for the first
// comparison and must be disabled afterward.
- GetMainFrame()->m_bExitIfNoDiff = FALSE;
+ GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
}
else
{
@@ -2591,7 +2594,7 @@
// Exit if files are identical should only work for the first
// comparison and must be disabled afterward.
- GetMainFrame()->m_bExitIfNoDiff = FALSE;
+ GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-06 20:00:27
|
Revision: 7415
http://winmerge.svn.sourceforge.net/winmerge/?rev=7415&view=rev
Author: gerundt
Date: 2010-11-06 20:00:20 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
BUG: [ 3070151 ] WinMerge 2.13.14 don't show menu icons - Add change log entry
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-11-06 19:25:28 UTC (rev 7414)
+++ trunk/Docs/Users/ChangeLog.txt 2010-11-06 20:00:20 UTC (rev 7415)
@@ -8,6 +8,7 @@
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add OpenCandy to the InnoSetup installer (#3088720)
+ Bugfix: No menu icons was shown on Windows x64 (#3070151)
Translation updates:
- Bulgarian (#3082392)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-06 19:25:34
|
Revision: 7414
http://winmerge.svn.sourceforge.net/winmerge/?rev=7414&view=rev
Author: gerundt
Date: 2010-11-06 19:25:28 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
Fix a 64 bit issue
Modified Paths:
--------------
branches/R2_14/Src/7zCommon.cpp
branches/R2_14/Src/dllpstub.h
Modified: branches/R2_14/Src/7zCommon.cpp
===================================================================
--- branches/R2_14/Src/7zCommon.cpp 2010-11-06 18:47:43 UTC (rev 7413)
+++ branches/R2_14/Src/7zCommon.cpp 2010-11-06 19:25:28 UTC (rev 7414)
@@ -735,7 +735,7 @@
*/
Merge7z::Proxy Merge7z =
{
- 0, 0, DllBuild_Merge7z,
+ { 0, 0, DllBuild_Merge7z },
"Merge7z%u%02u"DECORATE_U".dll",
"Merge7z"
};
Modified: branches/R2_14/Src/dllpstub.h
===================================================================
--- branches/R2_14/Src/dllpstub.h 2010-11-06 18:47:43 UTC (rev 7413)
+++ branches/R2_14/Src/dllpstub.h 2010-11-06 19:25:28 UTC (rev 7414)
@@ -36,6 +36,7 @@
DWORD dwMajorVersion; // Major version
DWORD dwMinorVersion; // Minor version
DWORD dwBuildNumber; // Build number
+ DWORD dwPadding; // Pad to 64 bit boundary
static void Throw(LPCSTR name, HMODULE, DWORD dwError, BOOL bFreeLibrary);
HMODULE Load();
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-06 18:47:49
|
Revision: 7413
http://winmerge.svn.sourceforge.net/winmerge/?rev=7413&view=rev
Author: gerundt
Date: 2010-11-06 18:47:43 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
BUG: [ 3070151 ] WinMerge 2.13.14 don't show menu icons
Modified Paths:
--------------
trunk/Src/BCMenu.cpp
Modified: trunk/Src/BCMenu.cpp
===================================================================
--- trunk/Src/BCMenu.cpp 2010-11-06 18:11:08 UTC (rev 7412)
+++ trunk/Src/BCMenu.cpp 2010-11-06 18:47:43 UTC (rev 7413)
@@ -3178,9 +3178,9 @@
GetDisabledBitmap(bmp3);
pWnd->ReleaseDC(pDC); // Release the DC
}
- UINT numcurrent=(UINT)m_AllImagesID.GetSize();
- UINT existsloc = -1;
- for(UINT i=0;i<numcurrent;++i){
+ INT_PTR numcurrent=m_AllImagesID.GetSize();
+ INT_PTR existsloc = -1;
+ for(INT_PTR i=0;i<numcurrent;++i){
if(m_AllImagesID[i]==nID){
existsloc=i;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-06 18:11:14
|
Revision: 7412
http://winmerge.svn.sourceforge.net/winmerge/?rev=7412&view=rev
Author: gerundt
Date: 2010-11-06 18:11:08 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
Disable patch #3026022 for WIN64 due to issues as per bug #3089575
Modified Paths:
--------------
trunk/Src/Merge.cpp
trunk/Src/MergeX64.vcproj
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2010-11-06 14:48:59 UTC (rev 7411)
+++ trunk/Src/Merge.cpp 2010-11-06 18:11:08 UTC (rev 7412)
@@ -72,7 +72,7 @@
/** @brief Location for command line help to open. */
static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
-
+#ifndef WIN64
/**
* @brief Turn STL exceptions into MFC exceptions.
* Based on the article "Visual C++ Exception-Handling Instrumentation"
@@ -128,6 +128,7 @@
RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args);
}
}
+#endif
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj 2010-11-06 14:48:59 UTC (rev 7411)
+++ trunk/Src/MergeX64.vcproj 2010-11-06 18:11:08 UTC (rev 7412)
@@ -55,7 +55,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -155,7 +155,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -253,7 +253,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -349,7 +349,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -701,7 +701,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -711,7 +711,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2035,7 +2035,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2045,7 +2045,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2081,7 +2081,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2091,7 +2091,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2275,7 +2275,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2285,7 +2285,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3739,7 +3739,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3749,7 +3749,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3881,7 +3881,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3891,7 +3891,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4061,7 +4061,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4071,7 +4071,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4479,7 +4479,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4489,7 +4489,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5469,7 +5469,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5479,7 +5479,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5657,7 +5657,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5667,7 +5667,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6199,7 +6199,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6209,7 +6209,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6383,7 +6383,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -6394,7 +6394,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -7215,7 +7215,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -7225,7 +7225,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-06 14:49:06
|
Revision: 7411
http://winmerge.svn.sourceforge.net/winmerge/?rev=7411&view=rev
Author: gerundt
Date: 2010-11-06 14:48:59 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
Disable patch #3026022 for WIN64 due to issues as per bug #3089575 - Revert also changes from MergeX64.vcproj
Modified Paths:
--------------
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-11-04 18:34:37 UTC (rev 7410)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-11-06 14:48:59 UTC (rev 7411)
@@ -55,7 +55,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -155,7 +155,7 @@
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -253,7 +253,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -349,7 +349,7 @@
AdditionalOptions="/EHa "
Optimization="0"
AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
+ PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -701,7 +701,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -711,7 +711,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2075,7 +2075,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2085,7 +2085,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2121,7 +2121,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2131,7 +2131,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2309,7 +2309,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -2319,7 +2319,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3729,7 +3729,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3739,7 +3739,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3871,7 +3871,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -3881,7 +3881,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4013,7 +4013,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4023,7 +4023,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4431,7 +4431,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -4441,7 +4441,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5413,7 +5413,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5423,7 +5423,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5601,7 +5601,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -5611,7 +5611,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6105,7 +6105,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6115,7 +6115,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -6289,7 +6289,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -6300,7 +6300,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -7077,7 +7077,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
@@ -7087,7 +7087,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-11-04 18:34:43
|
Revision: 7410
http://winmerge.svn.sourceforge.net/winmerge/?rev=7410&view=rev
Author: kimmov
Date: 2010-11-04 18:34:37 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
PATCH: #2818451 Improve color options organization
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Common/PreferencesDlg.cpp
branches/R2_14/Src/Common/PreferencesDlg.h
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-04 18:34:37 UTC (rev 7410)
@@ -11,6 +11,7 @@
Add accelerator keys for Shell context menu (#2823536)
Improve editing of linefilter regular expressions (#3015416)
Allow editing context line count in patch creator (#2092180)
+ Improve color options organization (#2818451)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/Src/Common/PreferencesDlg.cpp
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.cpp 2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Common/PreferencesDlg.cpp 2010-11-04 18:34:37 UTC (rev 7410)
@@ -102,9 +102,9 @@
AddPage(&m_pageGeneral, IDS_OPTIONSPG_GENERAL);
AddPage(&m_pageCompare, IDS_OPTIONSPG_COMPARE);
AddPage(&m_pageEditor, IDS_OPTIONSPG_EDITOR);
- AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS);
- AddPage(&m_pageTextColors, IDS_OPTIONSPG_TEXTCOLORS);
- AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_SYNTAXCOLORS);
+ AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MERGECOLORS);
+ AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYNTAXCOLORS);
+ AddPage(&m_pageTextColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_TEXTCOLORS);
AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE);
AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM);
AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS);
@@ -151,6 +151,14 @@
AddPage(pPage, sPath.c_str());
}
+void CPreferencesDlg::AddPage(CPropertyPage* pPage, UINT nTopHeading, UINT nSubHeading)
+{
+ String sPath = theApp.LoadString(nTopHeading);
+ sPath += _T(">");
+ sPath += theApp.LoadString(nSubHeading);
+ AddPage(pPage, sPath.c_str());
+}
+
void CPreferencesDlg::AddPage(CPropertyPage* pPage, LPCTSTR szPath)
{
CString sPath(szPath);
Modified: branches/R2_14/Src/Common/PreferencesDlg.h
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.h 2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Common/PreferencesDlg.h 2010-11-04 18:34:37 UTC (rev 7410)
@@ -99,6 +99,7 @@
protected:
void AddPage(CPropertyPage* pPage, UINT nResourceID);
void AddPage(CPropertyPage* pPage, LPCTSTR szPath);
+ void AddPage(CPropertyPage* pPage, UINT nTopHeading, UINT nSubHeading);
void SetActivePage(int nPage);
CString GetItemPath(HTREEITEM hti);
void ReadOptions(BOOL bUpdate = FALSE);
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Merge.rc 2010-11-04 18:34:37 UTC (rev 7410)
@@ -1945,14 +1945,15 @@
IDS_OPTIONSPG_COMPARE "Compare"
IDS_OPTIONSPG_EDITOR "Editor"
IDS_OPTIONSPG_COLORS "Colors"
- IDS_OPTIONSPG_SYNTAXCOLORS "Syntax colors"
- IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
+ IDS_OPTIONSPG_TEXTCOLORS "Text"
+ IDS_OPTIONSPG_SYNTAXCOLORS "Syntax"
IDS_OPTIONSPG_SYSTEM "System"
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
IDS_OPTIONSPG_BACKUPS "Backup Files"
IDS_OPTIONSPG_SHELL "Shell Integration"
+ IDS_OPTIONSPG_MERGECOLORS "Differences"
END
// WINMERGE CUSTOM STRINGS
Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h 2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/resource.h 2010-11-04 18:34:37 UTC (rev 7410)
@@ -490,6 +490,7 @@
#define IDS_OPTIONSPG_ARCHIVE 9050
#define IDS_OPTIONSPG_BACKUPS 9051
#define IDS_OPTIONSPG_SHELL 9052
+#define IDS_OPTIONSPG_MERGECOLORS 9053
#define IDS_TO 16000
#define IDS_FROM_LEFT 16001
#define IDS_TO_LEFT 16002
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-11-04 18:13:24
|
Revision: 7409
http://winmerge.svn.sourceforge.net/winmerge/?rev=7409&view=rev
Author: kimmov
Date: 2010-11-04 18:13:18 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
PATCH: #2092180 Allow editing context line count in patch creator
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/PatchDlg.cpp
branches/R2_14/Src/PatchDlg.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-11-04 18:13:18 UTC (rev 7409)
@@ -10,6 +10,7 @@
Add menuitems for selecting automatic or manual prediffing (#2638608)
Add accelerator keys for Shell context menu (#2823536)
Improve editing of linefilter regular expressions (#3015416)
+ Allow editing context line count in patch creator (#2092180)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/Merge.rc 2010-11-04 18:13:18 UTC (rev 7409)
@@ -1036,7 +1036,7 @@
COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Context:",IDC_STATIC,13,109,46,8
- COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWN | CBS_SORT |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46
CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",
Modified: branches/R2_14/Src/PatchDlg.cpp
===================================================================
--- branches/R2_14/Src/PatchDlg.cpp 2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/PatchDlg.cpp 2010-11-04 18:13:18 UTC (rev 7409)
@@ -175,6 +175,7 @@
// Save combobox history
m_ctlResult.SaveState(_T("Files\\DiffFileResult"));
+ m_comboContext.SaveState(_T("PatchCreator\\DiffContext"));
// Don't save filenames if multiple file selected (as editbox reads
// [X files selected])
if (selectCount <= 1)
@@ -201,6 +202,7 @@
// Load combobox history
m_ctlFile1.LoadState(_T("Files\\DiffFile1"));
m_ctlFile2.LoadState(_T("Files\\DiffFile2"));
+ m_comboContext.LoadState(_T("PatchCreator\\DiffContext"));
m_ctlResult.LoadState(_T("Files\\DiffFileResult"));
int count = m_fileList.size();
@@ -233,13 +235,15 @@
m_outputStyle = OUTPUT_NORMAL;
m_comboStyle.SetCurSel(0);
- // Add context line counts to combobox
- m_comboContext.AddString(_T("0"));
- m_comboContext.AddString(_T("1"));
- m_comboContext.AddString(_T("3"));
- m_comboContext.AddString(_T("5"));
- m_comboContext.AddString(_T("7"));
- m_comboContext.AddString(_T("11"));
+ // Add default context line counts to combobox if its empty
+ if (m_comboContext.GetCount() == 0)
+ {
+ m_comboContext.AddString(_T("0"));
+ m_comboContext.AddString(_T("1"));
+ m_comboContext.AddString(_T("3"));
+ m_comboContext.AddString(_T("5"));
+ m_comboContext.AddString(_T("7"));
+ }
LoadSettings();
Modified: branches/R2_14/Src/PatchDlg.h
===================================================================
--- branches/R2_14/Src/PatchDlg.h 2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/PatchDlg.h 2010-11-04 18:13:18 UTC (rev 7409)
@@ -43,18 +43,18 @@
// Construction
public:
CPatchDlg(CWnd* pParent = NULL); // standard constructor
-
+
// Functions to add and get selected files (as PATCHFILEs)
void AddItem(const PATCHFILES& pf);
int GetItemCount();
- const PATCHFILES& GetItemAt(int position);
+ const PATCHFILES& GetItemAt(int position);
void ClearItems();
// Dialog Data
//{{AFX_DATA(CPatchDlg)
enum { IDD = IDD_GENERATE_PATCH };
CComboBox m_comboStyle;
- CComboBox m_comboContext;
+ CSuperComboBox m_comboContext;
BOOL m_caseSensitive;
CSuperComboBox m_ctlFile1;
CSuperComboBox m_ctlFile2;
@@ -82,8 +82,8 @@
// Implementation
protected:
- std::vector<PATCHFILES> m_fileList; /**< Source files to create patch from */
-
+ std::vector<PATCHFILES> m_fileList; /**< Source files to create patch from */
+
void ChangeFile(const CString &sFile, BOOL bLeft);
void UpdateSettings();
void LoadSettings();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-11-03 18:53:02
|
Revision: 7408
http://winmerge.svn.sourceforge.net/winmerge/?rev=7408&view=rev
Author: kimmov
Date: 2010-11-03 18:52:56 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Merge UnicodeString from trunk.
Modified Paths:
--------------
branches/R2_14/Src/Common/UnicodeString.cpp
branches/R2_14/Src/Common/UnicodeString.h
Modified: branches/R2_14/Src/Common/UnicodeString.cpp
===================================================================
--- branches/R2_14/Src/Common/UnicodeString.cpp 2010-11-03 17:50:26 UTC (rev 7407)
+++ branches/R2_14/Src/Common/UnicodeString.cpp 2010-11-03 18:52:56 UTC (rev 7408)
@@ -23,10 +23,30 @@
// ID line follows -- this is updated by SVN
// $Id$
+// String formatting code originally from Paul Senzee:
+// http://www.senzee5.com/2006/05/c-formatting-stdstring.html
+
#include <tchar.h>
+#include <stdarg.h>
#include "UnicodeString.h"
+static String format_arg_list(const TCHAR *fmt, va_list args);
+
/**
+ * @brief Convert a string to lower case string.
+ * @param [in] str String to convert to lower case.
+ * @return Lower case string.
+ */
+String string_makelower(const String &str)
+{
+ String ret(str);
+ String::size_type i = 0;
+ for (i = 0; i < ret.length(); i++)
+ ret[i] = _totlower(ret[i]);
+ return ret;
+}
+
+/**
* @brief Replace a string inside a string with another string.
* This function searches for a string inside another string an if found,
* replaces it with another string. Function can replace several instances
@@ -37,11 +57,12 @@
*/
void string_replace(String &target, const String &find, const String &replace)
{
- const std::string::size_type replace_len = find.length();
- std::string::size_type pos = 0;
+ const String::size_type find_len = find.length();
+ const String::size_type replace_len = replace.length();
+ String::size_type pos = 0;
while ((pos = target.find(find, pos)) != String::npos)
{
- target.replace(pos, replace_len, replace);
+ target.replace(pos, find_len, replace);
pos += replace_len;
}
}
@@ -56,7 +77,7 @@
{
String s1(str1);
String s2(str2);
- String::size_type i = 0;
+ String::size_type i = 0;
for (i = 0; i < s1.length(); i++)
s1[i] = _totlower(s1[i]);
for (i = 0; i < s2.length(); i++)
@@ -72,19 +93,99 @@
*/
String string_trim_ws(const String & str)
{
+ if (str.empty())
+ return str;
+
String result(str);
String::iterator it = result.begin();
- while (_istspace(*it))
+ while (it != result.end() && _istspace(*it))
++it;
if (it != result.begin())
result.erase(result.begin(), it);
+ if (result.empty())
+ return result;
+
it = result.end() - 1;
+ while (it != result.begin() &&_istspace(*it))
+ --it;
+
+ if (it != result.end() - 1)
+ result.erase(it + 1, result.end());
+ return result;
+}
+
+/**
+ * @brief Trims whitespace chars from begin of the string.
+ * @param [in] str the original string.
+ * @return Trimmed string.
+ */
+String string_trim_ws_begin(const String & str)
+{
+ if (str.empty())
+ return str;
+
+ String result(str);
+ String::iterator it = result.begin();
while (_istspace(*it))
+ ++it;
+
+ if (it != result.begin())
+ result.erase(result.begin(), it);
+ return result;
+}
+
+/**
+ * @brief Trims whitespace chars from end of the string.
+ * @param [in] str the original string.
+ * @return Trimmed string.
+ */
+String string_trim_ws_end(const String & str)
+{
+ if (str.empty())
+ return str;
+
+ String result(str);
+ String::iterator it = result.end() - 1;
+ while (_istspace(*it))
--it;
if (it != result.end() - 1)
result.erase(it + 1, result.end());
return result;
}
+
+static String format_arg_list(const TCHAR *fmt, va_list args)
+{
+ if (!fmt)
+ return _T("");
+ int result = -1;
+ int length = 256;
+ TCHAR *buffer = 0;
+ while (result == -1)
+ {
+ if (buffer)
+ delete [] buffer;
+ buffer = new TCHAR[length + 1];
+ memset(buffer, 0, (length + 1) * sizeof(TCHAR));
+ result = _vsntprintf(buffer, length, fmt, args);
+ length *= 2;
+ }
+ String s(buffer);
+ delete [] buffer;
+ return s;
+}
+
+/**
+ * @brief printf()-style formatting for STL string.
+ * Use this function to format String:s in printf() style.
+ */
+String string_format(const TCHAR *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ String s = format_arg_list(fmt, args);
+ va_end(args);
+ return s;
+}
Modified: branches/R2_14/Src/Common/UnicodeString.h
===================================================================
--- branches/R2_14/Src/Common/UnicodeString.h 2010-11-03 17:50:26 UTC (rev 7407)
+++ branches/R2_14/Src/Common/UnicodeString.h 2010-11-03 18:52:56 UTC (rev 7408)
@@ -37,6 +37,8 @@
typedef std_tchar(string) String;
+String string_makelower(const String &str);
+
void string_replace(String &target, const String &find, const String &replace);
// Comparing
@@ -44,5 +46,10 @@
// Trimming
String string_trim_ws(const String & str);
+String string_trim_ws_begin(const String & str);
+String string_trim_ws_end(const String & str);
+// Formatting
+String string_format(const TCHAR *fmt, ...);
+
#endif // _UNICODE_STRING_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-11-03 17:50:32
|
Revision: 7407
http://winmerge.svn.sourceforge.net/winmerge/?rev=7407&view=rev
Author: kimmov
Date: 2010-11-03 17:50:26 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Buildscript: Remove building of ANSI targets.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/create_release.py
Modified: branches/R2_14/Tools/Scripts/create_release.py
===================================================================
--- branches/R2_14/Tools/Scripts/create_release.py 2010-11-03 17:47:52 UTC (rev 7406)
+++ branches/R2_14/Tools/Scripts/create_release.py 2010-11-03 17:50:26 UTC (rev 7407)
@@ -113,14 +113,6 @@
print 'Skipping folder %s' % winmerge_temp
try:
- print 'Remove ANSI files'
- if os.path.exists('build/mergerelease/WinMerge.exe'):
- os.remove('build/mergerelease/WinMerge.exe')
- if os.path.exists('build/mergerelease/ShellExtension.dll'):
- os.remove('build/mergerelease/ShellExtension.dll')
- if os.path.exists('build/mergerelease/MergeLang.dll'):
- os.remove('build/mergerelease/MergeLang.dll')
-
print 'Remove Unicode files'
if os.path.exists('build/mergeunicoderelease/WinMergeU.exe'):
os.remove('build/mergeunicoderelease/WinMergeU.exe')
@@ -134,16 +126,12 @@
print 'Remove expat files'
if os.path.exists('build/expat'):
shutil.rmtree('build/expat', True)
- if os.path.exists('build/mergerelease/libexpat.dll'):
- os.remove('build/mergerelease/libexpat.dll')
if os.path.exists('build/mergeunicoderelease/libexpat.dll'):
os.remove('build/mergeunicoderelease/libexpat.dll')
print 'Remove pcre files'
if os.path.exists('build/pcre'):
shutil.rmtree('build/pcre', True)
- if os.path.exists('build/mergerelease/pcre.dll'):
- os.remove('build/mergerelease/pcre.dll')
if os.path.exists('build/mergeunicoderelease/pcre.dll'):
os.remove('build/mergeunicoderelease/pcre.dll')
@@ -282,17 +270,12 @@
#print sol_path
# devenv Src\Merge.dsp /rebuild Release
- print 'Build WinMerge executables...'
- ret = call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
+ print 'Build WinMerge executable...'
+ ret = call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell = True)
if ret == 0:
- ret = call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell=True)
- if ret == 0:
- return True
- else:
- print 'ERROR: Failed to build Unicode release target of WinMerge!'
- return False
+ return True
else:
- print 'ERROR: Failed to build ANSI release target of WinMerge!'
+ print 'ERROR: Failed to build Unicode release target of WinMerge!'
return False
def build_shellext(vs_cmd):
@@ -306,10 +289,6 @@
# devenv Src\Merge.dsp /rebuild Release
print 'Build ShellExtension dlls...'
- ret = call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency|Win32'])
- if ret != 0:
- print 'ERROR: Failed to build ANSI target of ShellExtension!'
- return False
ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency|Win32'])
if ret == 0:
if build_64bit == True:
@@ -379,10 +358,8 @@
os.chdir(cur_path)
print 'Copying files to binary distribution folder...'
- shutil.copy('build/mergerelease/WinMerge.exe', bin_folder)
shutil.copy('build/mergeunicoderelease/WinMergeU.exe', bin_folder)
- shutil.copy('build/ShellExtension/Release MinDependency/ShellExtension.dll', bin_folder)
shutil.copy('build/ShellExtension/unicode release mindependency/ShellExtensionU.dll', bin_folder)
shutil.copy('build/mergeunicoderelease/MergeLang.dll', bin_folder)
shutil.copy('build/ShellExtension/x64 release/ShellExtensionX64.dll', bin_folder)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-11-03 17:47:58
|
Revision: 7406
http://winmerge.svn.sourceforge.net/winmerge/?rev=7406&view=rev
Author: kimmov
Date: 2010-11-03 17:47:52 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Buildscript: Remove building of hexedit library.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/create_release.py
Modified: branches/R2_14/Tools/Scripts/create_release.py
===================================================================
--- branches/R2_14/Tools/Scripts/create_release.py 2010-11-03 17:10:29 UTC (rev 7405)
+++ branches/R2_14/Tools/Scripts/create_release.py 2010-11-03 17:47:52 UTC (rev 7406)
@@ -150,14 +150,6 @@
if os.path.exists('build/scew'):
shutil.rmtree('build/scew', True)
- print 'Remove heksedit files'
- if os.path.exists('build/heksedit'):
- shutil.rmtree('build/heksedit', True)
- if os.path.exists('build/mergerelease/heksedit.dll'):
- os.remove('build/mergerelease/heksedit.dll')
- if os.path.exists('build/mergerelease/hekseditU.dll'):
- os.remove('build/mergerelease/hekseditU.dll')
-
if os.path.exists('build/Manual'):
shutil.rmtree('build/Manual', True)
@@ -272,11 +264,6 @@
#print solution_path
call([vs_cmd, solution_path, '/rebuild', 'MinSizeRel'], shell=True)
- print 'Build heksedit library...'
- solution_path = os.path.join(cur_path, 'Externals/heksedit/heksedit.vcproj')
- call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
- call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell=True)
-
def build_targets():
"""Builds all WinMerge targets."""
@@ -404,8 +391,6 @@
shutil.copy('build/pcre/pcre.dll', bin_folder)
shutil.copy('build/expat/libexpat.dll', bin_folder)
- shutil.copy('build/heksedit/heksedit.dll', bin_folder)
- shutil.copy('build/heksedit/hekseditU.dll', bin_folder)
copy_po_files(lang_folder)
filter_orig = os.path.join(dist_src_folder, 'Filters')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-03 17:10:37
|
Revision: 7405
http://winmerge.svn.sourceforge.net/winmerge/?rev=7405&view=rev
Author: gerundt
Date: 2010-11-03 17:10:29 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
PATCH: [ 3099867 ] Drop Ansi config from ShellExtension project
Modified Paths:
--------------
branches/R2_14/ShellExtension/ShellExtension.vcproj
Modified: branches/R2_14/ShellExtension/ShellExtension.vcproj
===================================================================
--- branches/R2_14/ShellExtension/ShellExtension.vcproj 2010-11-03 17:10:16 UTC (rev 7404)
+++ branches/R2_14/ShellExtension/ShellExtension.vcproj 2010-11-03 17:10:29 UTC (rev 7405)
@@ -583,575 +583,6 @@
/>
</Configuration>
<Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\/ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinDependency|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinSize|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinSize|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(IntDir)\ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
Name="X64 Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
@@ -1603,68 +1034,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1773,68 +1142,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1943,68 +1250,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2201,72 +1446,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2314,54 +1493,6 @@
<File
RelativePath="ShellExtensionU.def"
>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp"
@@ -2441,80 +1572,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2631,68 +1688,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2801,68 +1796,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2997,60 +1930,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -3151,66 +2030,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3315,66 +2134,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3479,66 +2238,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3643,66 +2342,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3807,66 +2446,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3971,66 +2550,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4135,66 +2654,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4299,66 +2758,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4463,66 +2862,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4627,66 +2966,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4791,66 +3070,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4955,66 +3174,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5119,66 +3278,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5283,66 +3382,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5447,66 +3486,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5611,66 +3590,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=...
[truncated message content] |
|
From: <ge...@us...> - 2010-11-03 17:10:24
|
Revision: 7404
http://winmerge.svn.sourceforge.net/winmerge/?rev=7404&view=rev
Author: gerundt
Date: 2010-11-03 17:10:16 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
PATCH: [ 3099867 ] Drop Ansi config from ShellExtension project
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.vcproj
Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj 2010-11-02 07:35:06 UTC (rev 7403)
+++ trunk/ShellExtension/ShellExtension.vcproj 2010-11-03 17:10:16 UTC (rev 7404)
@@ -583,575 +583,6 @@
/>
</Configuration>
<Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\/ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinDependency|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinSize|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(OutDir)\ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release MinSize|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName="$(IntDir)\ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
- AssemblerListingLocation="$(IntDir)\"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary="$(IntDir)\ShellExtension.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
Name="X64 Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
@@ -1603,68 +1034,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1773,68 +1142,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1943,68 +1250,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2201,72 +1446,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="true"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2314,54 +1493,6 @@
<File
RelativePath="ShellExtensionU.def"
>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp"
@@ -2441,80 +1572,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2631,68 +1688,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2801,68 +1796,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2997,60 +1930,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -3151,66 +2030,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3315,66 +2134,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3479,66 +2238,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3643,66 +2342,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3807,66 +2446,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -3971,66 +2550,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4135,66 +2654,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4299,66 +2758,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4463,66 +2862,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4627,66 +2966,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4791,66 +3070,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -4955,66 +3174,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5119,66 +3278,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5283,66 +3382,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5447,66 +3486,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
@@ -5611,66 +3590,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectori...
[truncated message content] |
|
From: <jt...@us...> - 2010-11-02 07:35:13
|
Revision: 7403
http://winmerge.svn.sourceforge.net/winmerge/?rev=7403&view=rev
Author: jtuc
Date: 2010-11-02 07:35:06 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Disable patch #3026022 for WIN64 due to issues as per bug #3089575
Modified Paths:
--------------
branches/R2_14/Src/Merge.cpp
Modified: branches/R2_14/Src/Merge.cpp
===================================================================
--- branches/R2_14/Src/Merge.cpp 2010-11-01 14:59:25 UTC (rev 7402)
+++ branches/R2_14/Src/Merge.cpp 2010-11-02 07:35:06 UTC (rev 7403)
@@ -72,6 +72,7 @@
static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
+#ifndef WIN64
/**
* @brief Turn STL exceptions into MFC exceptions.
* Based on the article "Visual C++ Exception-Handling Instrumentation"
@@ -127,6 +128,7 @@
RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args);
}
}
+#endif
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-01 14:59:34
|
Revision: 7402
http://winmerge.svn.sourceforge.net/winmerge/?rev=7402&view=rev
Author: gerundt
Date: 2010-11-01 14:59:25 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Add missing SCEW files to R2_14
Added Paths:
-----------
branches/R2_14/Externals/scew/scew/bool.h
branches/R2_14/Externals/scew/scew/element_attribute.c
branches/R2_14/Externals/scew/scew/element_compare.c
branches/R2_14/Externals/scew/scew/element_copy.c
branches/R2_14/Externals/scew/scew/element_search.c
branches/R2_14/Externals/scew/scew/export.h
branches/R2_14/Externals/scew/scew/list.c
branches/R2_14/Externals/scew/scew/list.h
branches/R2_14/Externals/scew/scew/printer.c
branches/R2_14/Externals/scew/scew/printer.h
branches/R2_14/Externals/scew/scew/reader.c
branches/R2_14/Externals/scew/scew/reader.h
branches/R2_14/Externals/scew/scew/reader_buffer.c
branches/R2_14/Externals/scew/scew/reader_buffer.h
branches/R2_14/Externals/scew/scew/reader_file.c
branches/R2_14/Externals/scew/scew/reader_file.h
branches/R2_14/Externals/scew/scew/writer_buffer.c
branches/R2_14/Externals/scew/scew/writer_buffer.h
branches/R2_14/Externals/scew/scew/writer_file.c
branches/R2_14/Externals/scew/scew/writer_file.h
Added: branches/R2_14/Externals/scew/scew/bool.h
===================================================================
--- branches/R2_14/Externals/scew/scew/bool.h (rev 0)
+++ branches/R2_14/Externals/scew/scew/bool.h 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,40 @@
+/**
+ * @file bool.h
+ * @brief SCEW boolean type declaration
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Sep 04, 2008 11:42
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2008, 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ **/
+
+#ifndef BOOL_H_0809041142
+#define BOOL_H_0809041142
+
+/**
+ * This should be defined using stdbool.h when C99 is available.
+ */
+typedef unsigned char scew_bool;
+
+#define SCEW_TRUE ((scew_bool) 1) /**< True */
+#define SCEW_FALSE ((scew_bool) 0) /**< False */
+
+#endif /* BOOL_H_0809041142 */
Property changes on: branches/R2_14/Externals/scew/scew/bool.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/element_attribute.c
===================================================================
--- branches/R2_14/Externals/scew/scew/element_attribute.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/element_attribute.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,308 @@
+/**
+ * @file element_attribute.c
+ * @brief element.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Aug 27, 2009 01:43
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ */
+
+#include "xelement.h"
+
+#include "str.h"
+
+#include "xattribute.h"
+#include "xerror.h"
+
+#include <assert.h>
+
+
+
+/* Private */
+
+static scew_bool cmp_attr_name_ (void const *attribute, void const *name);
+
+static scew_attribute* add_new_attribute_ (scew_element *element,
+ scew_attribute *attribute);
+
+static scew_attribute* update_attribute_ (scew_element *element,
+ scew_attribute *attribute,
+ XML_Char const *value);
+
+
+/* Public */
+
+unsigned int
+scew_element_attribute_count (scew_element const *element)
+{
+ assert (element != NULL);
+
+ return element->n_attributes;
+}
+
+scew_list*
+scew_element_attributes (scew_element const *element)
+{
+ assert (element != NULL);
+
+ return element->attributes;
+}
+
+scew_attribute*
+scew_element_attribute_by_name (scew_element const *element,
+ XML_Char const *name)
+{
+ scew_list *item = NULL;
+
+ assert (element != NULL);
+ assert (name != NULL);
+
+ if (element->attributes != NULL)
+ {
+ item = scew_list_find_custom (element->attributes, name, cmp_attr_name_);
+ }
+
+ return (NULL == item) ? NULL : (scew_attribute *) scew_list_data (item);
+}
+
+scew_attribute*
+scew_element_attribute_by_index (scew_element const *element,
+ unsigned int index)
+{
+ scew_list *item = NULL;
+
+ assert (element != NULL);
+ assert (index < element->n_attributes);
+
+ if (element->attributes != NULL)
+ {
+ item = scew_list_index (element->attributes, index);
+ }
+
+ return (NULL == item) ? NULL : (scew_attribute *) scew_list_data (item);
+}
+
+scew_attribute*
+scew_element_add_attribute (scew_element *element, scew_attribute *attribute)
+{
+ scew_attribute *new_attribute = NULL;
+
+ assert (element != NULL);
+ assert (attribute != NULL);
+
+ if (scew_attribute_parent (attribute) == NULL)
+ {
+ XML_Char const *name = scew_attribute_name (attribute);
+ XML_Char const *value = scew_attribute_value (attribute);
+
+ /* Try to find an existent attribute. */
+ scew_attribute *old_attribute = scew_element_attribute_by_name (element,
+ name);
+
+ /* Add new attribute or update existent one. */
+ new_attribute = (NULL == old_attribute)
+ ? add_new_attribute_ (element, attribute)
+ : update_attribute_ (element, old_attribute, value);
+ }
+
+ return new_attribute;
+}
+
+
+scew_attribute*
+scew_element_add_attribute_pair (scew_element *element,
+ XML_Char const *name,
+ XML_Char const *value)
+{
+ scew_attribute *old_attribute = NULL;
+ scew_attribute *new_attribute = NULL;
+
+ assert (element != NULL);
+ assert (name != NULL);
+ assert (value != NULL);
+
+ /* Try to find an existent attribute. */
+ old_attribute = scew_element_attribute_by_name (element, name);
+
+ if (NULL == old_attribute)
+ {
+ /**
+ * If the attribute does not exist, create a new one and try to
+ * add it.
+ */
+ scew_attribute *attribute = scew_attribute_create (name, value);
+
+ if (attribute != NULL)
+ {
+ new_attribute = add_new_attribute_ (element, attribute);
+
+ if (NULL == new_attribute)
+ {
+ /* The new attribute could not be added, free it. */
+ scew_attribute_free (attribute);
+ }
+ }
+ }
+ else
+ {
+ /* If the attribtue already exists we update its value. */
+ new_attribute = update_attribute_ (element, old_attribute, value);
+ }
+
+ return new_attribute;
+}
+
+void
+scew_element_delete_attribute (scew_element *element,
+ scew_attribute *attribute)
+{
+ assert (element != NULL);
+ assert (attribute != NULL);
+
+ element->attributes = scew_list_delete (element->attributes, attribute);
+ element->n_attributes -= 1;
+
+ scew_attribute_free (attribute);
+}
+
+void
+scew_element_delete_attribute_all (scew_element *element)
+{
+ scew_list *list = NULL;
+
+ assert (element != NULL);
+
+ /* Free all attributes. */
+ list = element->attributes;
+ while (list != NULL)
+ {
+ scew_attribute *aux = scew_list_data (list);
+ list = scew_list_next (list);
+ scew_attribute_free (aux);
+ }
+ scew_list_free (element->attributes);
+
+ element->attributes = NULL;
+ element->last_attribute = NULL;
+ element->n_attributes = 0;
+}
+
+void
+scew_element_delete_attribute_by_name (scew_element *element,
+ XML_Char const* name)
+{
+ assert (element != NULL);
+ assert (name != NULL);
+
+ if (element->attributes != NULL)
+ {
+ scew_list *item =
+ scew_list_find_custom (element->attributes, name, cmp_attr_name_);
+
+ if (item != NULL)
+ {
+ scew_attribute *attribute = scew_list_data (item);
+ scew_element_delete_attribute (element, attribute);
+ }
+ }
+}
+
+void
+scew_element_delete_attribute_by_index (scew_element *element,
+ unsigned int index)
+{
+ assert (element != NULL);
+ assert (index < element->n_attributes);
+
+ if (element->attributes != NULL)
+ {
+ scew_list *item = scew_list_index (element->attributes, index);
+
+ if (item != NULL)
+ {
+ scew_attribute *attribute = scew_list_data (item);
+ scew_element_delete_attribute (element, attribute);
+ }
+ }
+}
+
+
+/* Private */
+
+scew_bool
+cmp_attr_name_ (void const *attribute, void const *name)
+{
+ return (scew_strcmp (scew_attribute_name ((scew_attribute *) attribute),
+ (XML_Char *) name) == 0);
+}
+
+scew_attribute*
+add_new_attribute_ (scew_element *element, scew_attribute *attribute)
+{
+ scew_list *item = NULL;
+ scew_attribute *new_attribute = NULL;
+
+ assert (element != NULL);
+ assert (attribute != NULL);
+
+ item = scew_list_append (element->last_attribute, attribute);
+
+ if (item != NULL)
+ {
+ /* Initialise attributes list. */
+ if (NULL == element->attributes)
+ {
+ element->attributes = item;
+ }
+
+ scew_attribute_set_parent_ (attribute, element);
+
+ /* Update performance variables. */
+ element->last_attribute = item;
+ element->n_attributes += 1;
+
+ /* Update the return value. */
+ new_attribute = attribute;
+ }
+ else
+ {
+ scew_error_set_last_error_ (scew_error_no_memory);
+ }
+
+ return new_attribute;
+}
+
+scew_attribute*
+update_attribute_ (scew_element *element,
+ scew_attribute *attribute,
+ XML_Char const *value)
+{
+ XML_Char const *new_value = NULL;
+
+ assert (element != NULL);
+ assert (attribute != NULL);
+ assert (value != NULL);
+
+ new_value = scew_attribute_set_value (attribute, value);
+
+ return (NULL == new_value) ? NULL : attribute;
+}
Property changes on: branches/R2_14/Externals/scew/scew/element_attribute.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/element_compare.c
===================================================================
--- branches/R2_14/Externals/scew/scew/element_compare.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/element_compare.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,137 @@
+/**
+ * @file element_compare.c
+ * @brief element.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Aug 27, 2009 01:38
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ */
+
+#include "xelement.h"
+
+#include "attribute.h"
+#include "str.h"
+
+#include <assert.h>
+
+
+
+/* Private */
+
+static scew_bool compare_element_ (scew_element const *a,
+ scew_element const *b);
+static scew_bool compare_children_ (scew_element const *a,
+ scew_element const *b,
+ scew_element_cmp_hook hook);
+static scew_bool compare_attributes_ (scew_element const *a,
+ scew_element const *b);
+
+
+
+/* Public */
+
+scew_bool
+scew_element_compare (scew_element const *a,
+ scew_element const *b,
+ scew_element_cmp_hook hook)
+{
+ scew_element_cmp_hook cmp_hook = NULL;
+
+ assert (a != NULL);
+ assert (b != NULL);
+
+ cmp_hook = (NULL == hook) ? compare_element_ : hook;
+
+ return (cmp_hook (a, b) && compare_children_ (a, b, cmp_hook));
+}
+
+
+/* Private */
+
+scew_bool
+compare_element_ (scew_element const *a, scew_element const *b)
+{
+ scew_bool equal = SCEW_FALSE;
+
+ assert (a != NULL);
+ assert (b != NULL);
+
+ equal = (scew_strcmp (a->name, b->name) == 0)
+ && (scew_strcmp (a->contents, b->contents) == 0)
+ && compare_attributes_ (a, b);
+
+ return equal;
+}
+
+scew_bool
+compare_attributes_ (scew_element const *a, scew_element const *b)
+{
+ scew_bool equal = SCEW_TRUE;
+ scew_list *list_a = NULL;
+ scew_list *list_b = NULL;
+
+ assert (a != NULL);
+ assert (b != NULL);
+
+ equal = (a->n_attributes == b->n_attributes);
+
+ list_a = a->attributes;
+ list_b = b->attributes;
+ while (equal && (list_a != NULL) && (list_b != NULL))
+ {
+ scew_attribute *attr_a = scew_list_data (list_a);
+ scew_attribute *attr_b = scew_list_data (list_b);
+ equal = scew_attribute_compare (attr_a, attr_b);
+ list_a = scew_list_next (list_a);
+ list_b = scew_list_next (list_b);
+ }
+
+ return equal;
+}
+
+scew_bool
+compare_children_ (scew_element const *a,
+ scew_element const *b,
+ scew_element_cmp_hook hook)
+{
+ scew_bool equal = SCEW_TRUE;
+ scew_list *list_a = NULL;
+ scew_list *list_b = NULL;
+
+ assert (a != NULL);
+ assert (b != NULL);
+
+ equal = (a->n_children == b->n_children);
+
+ list_a = a->children;
+ list_b = b->children;
+ while (equal && (list_a != NULL) && (list_b != NULL))
+ {
+ scew_element *child_a = scew_list_data (list_a);
+ scew_element *child_b = scew_list_data (list_b);
+ equal = scew_element_compare (child_a, child_b, hook);
+ list_a = scew_list_next (list_a);
+ list_b = scew_list_next (list_b);
+ }
+
+ return equal;
+}
Property changes on: branches/R2_14/Externals/scew/scew/element_compare.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/element_copy.c
===================================================================
--- branches/R2_14/Externals/scew/scew/element_copy.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/element_copy.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,126 @@
+/**
+ * @file element_search.c
+ * @brief element.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Aug 27, 2009 01:53
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ */
+
+#include "xelement.h"
+
+#include "attribute.h"
+
+#include <assert.h>
+
+
+
+/* Private */
+
+static scew_bool copy_children_ (scew_element *new_element,
+ scew_element const *element);
+static scew_bool copy_attributes_ (scew_element *new_element,
+ scew_element const *element);
+
+
+
+/* Public */
+
+scew_element*
+scew_element_copy (scew_element const *element)
+{
+ scew_element *new_elem = NULL;
+
+ assert (element != NULL);
+
+ new_elem = calloc (1, sizeof (scew_element));
+
+ if (new_elem != NULL)
+ {
+ scew_bool copied =
+ ((NULL == element->contents)
+ || (scew_element_set_contents (new_elem, element->contents) != NULL));
+
+ copied = copied
+ && (scew_element_set_name (new_elem, element->name) != NULL)
+ && copy_children_ (new_elem, element)
+ && copy_attributes_ (new_elem, element);
+
+ if (!copied)
+ {
+ scew_element_free (new_elem);
+ new_elem = NULL;
+ }
+ }
+
+ return new_elem;
+}
+
+
+
+/* Private */
+
+scew_bool
+copy_children_ (scew_element *new_element, scew_element const *element)
+{
+ scew_bool copied = SCEW_TRUE;
+ scew_list *list = NULL;
+
+ assert (new_element != NULL);
+ assert (element != NULL);
+
+ list = element->children;
+ while (copied && (list != NULL))
+ {
+ scew_element *child = scew_list_data (list);
+ scew_element *new_child = scew_element_copy (child);
+ copied =
+ ((new_child != NULL)
+ && (scew_element_add_element (new_element, new_child) != NULL));
+ list = scew_list_next (list);
+ }
+
+ return copied;
+}
+
+scew_bool
+copy_attributes_ (scew_element *new_element, scew_element const *element)
+{
+ scew_bool copied = SCEW_TRUE;
+ scew_list *list = NULL;
+
+ assert (new_element != NULL);
+ assert (element != NULL);
+
+ list = element->attributes;
+ while (copied && (list != NULL))
+ {
+ scew_attribute *attr = scew_list_data (list);
+ scew_attribute *new_attr = scew_attribute_copy (attr);
+ copied =
+ ((new_attr != NULL)
+ && (scew_element_add_attribute (new_element, new_attr) != NULL));
+ list = scew_list_next (list);
+ }
+
+ return copied;
+}
Property changes on: branches/R2_14/Externals/scew/scew/element_copy.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/element_search.c
===================================================================
--- branches/R2_14/Externals/scew/scew/element_search.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/element_search.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,110 @@
+/**
+ * @file element_search.c
+ * @brief element.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Aug 27, 2009 01:36
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ */
+
+#include "xelement.h"
+
+#include "str.h"
+
+#include <assert.h>
+
+
+
+/* Private */
+
+static scew_bool cmp_name_ (void const *element, void const *name);
+
+
+
+/* Public */
+
+scew_element*
+scew_element_by_name (scew_element const *element, XML_Char const *name)
+{
+ scew_list *item = NULL;
+
+ assert (element != NULL);
+ assert (name != NULL);
+
+ if (element->children != NULL)
+ {
+ item = scew_list_find_custom (element->children, name, cmp_name_);
+ }
+
+ return (NULL == item) ? NULL : (scew_element *) scew_list_data (item);
+}
+
+scew_element*
+scew_element_by_index (scew_element const *element, unsigned int index)
+{
+ scew_list *item = NULL;
+
+ assert (element != NULL);
+ assert (index < element->n_children);
+
+ item = scew_list_index (element->children, index);
+
+ return (NULL == item) ? NULL : (scew_element *) scew_list_data (item);
+}
+
+scew_list*
+scew_element_list_by_name (scew_element const *element, XML_Char const *name)
+{
+ scew_list *list = NULL;
+ scew_list *last = NULL;
+ scew_list *item = NULL;
+
+ assert (element != NULL);
+ assert (name != NULL);
+
+ item = element->children;
+ while (item != NULL)
+ {
+ item = scew_list_find_custom (item, name, cmp_name_);
+ if (item != NULL)
+ {
+ last = scew_list_append (last, scew_list_data (item));
+ if (NULL == list)
+ {
+ list = last;
+ }
+ item = scew_list_next (item);
+ }
+ }
+
+ return list;
+}
+
+
+/* Private */
+
+scew_bool
+cmp_name_ (void const *element, void const *name)
+{
+ return (scew_strcmp (((scew_element *) element)->name,
+ (XML_Char *) name) == 0);
+}
Property changes on: branches/R2_14/Externals/scew/scew/element_search.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/export.h
===================================================================
--- branches/R2_14/Externals/scew/scew/export.h (rev 0)
+++ branches/R2_14/Externals/scew/scew/export.h 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,77 @@
+/**
+ * @file export.h
+ * @brief SCEW shared library support
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Fri Sep 04, 2009 00:14
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ */
+
+#ifndef EXPORT_H_0909040014
+#define EXPORT_H_0909040014
+
+#if !defined (_MSC_VER) && defined (XML_UNICODE_WCHAR_T)
+#error UTF-16 support is only available in Windows platforms
+#endif
+
+#if defined (_MSC_VER) || defined (__CYGWIN__)
+
+ #define SCEW_DLL_IMPORT __declspec(dllimport)
+ #define SCEW_DLL_EXPORT __declspec(dllexport)
+ #define SCEW_DLL_LOCAL
+
+#else
+
+ #if __GNUC__ >= 4
+ #define SCEW_DLL_IMPORT __attribute__ ((visibility("default")))
+ #define SCEW_DLL_EXPORT __attribute__ ((visibility("default")))
+ #define SCEW_DLL_LOCAL __attribute__ ((visibility("hidden")))
+ #else
+ #define SCEW_DLL_IMPORT
+ #define SCEW_DLL_EXPORT
+ #define SCEW_DLL_LOCAL
+ #endif /* __GNUC__ >= 4 */
+
+ #ifdef PIC /* This will tell us if we are building a shared library. */
+ #define SCEW_DLL
+ #endif /* PIC */
+
+#endif /* _MSC_VER || __CYGWIN__ */
+
+#ifdef SCEW_DLL /* Defined if SCEW is compiled as a DLL. */
+
+ #ifdef DLL_EXPORTS /* Defined if we are building the SCEW DLL. */
+ #define SCEW_API SCEW_DLL_EXPORT
+ #else
+ #define SCEW_API SCEW_DLL_IMPORT
+ #endif /* DLL_EXPORTS */
+
+ #define SCEW_LOCAL SCEW_DLL_LOCAL
+
+#else /* SCEW_DLL is not defined: this means SCEW is a static lib. */
+
+ #define SCEW_API
+ #define SCEW_LOCAL
+
+#endif /* SCEW_DLL */
+
+#endif /* EXPORT_H_0909040014 */
Property changes on: branches/R2_14/Externals/scew/scew/export.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/list.c
===================================================================
--- branches/R2_14/Externals/scew/scew/list.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/list.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,321 @@
+/**
+ * @file list.c
+ * @brief list.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Jul 12, 2007 20:09
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2007-2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ **/
+
+#include "list.h"
+
+#include <assert.h>
+#include <stdlib.h>
+
+
+/* Private */
+
+struct scew_list
+{
+ void *data;
+ scew_list *prev;
+ scew_list *next;
+};
+
+
+/* Public */
+
+
+/* Allocation */
+
+scew_list*
+scew_list_create (void *data)
+{
+ scew_list *list = NULL;
+
+ assert (data != NULL);
+
+ list = calloc (1, sizeof (scew_list));
+
+ if (list != NULL)
+ {
+ list->data = data;
+ }
+
+ return list;
+}
+
+void
+scew_list_free (scew_list *list)
+{
+ while (list != NULL)
+ {
+ scew_list *tmp = list;
+ list = list->next;
+ free (tmp);
+ }
+}
+
+
+/* Accessors */
+
+void*
+scew_list_data (scew_list *list)
+{
+ assert (list != NULL);
+
+ return list->data;
+}
+
+unsigned int
+scew_list_size (scew_list *list)
+{
+ unsigned int total = 0;
+
+ while (list != NULL)
+ {
+ ++total;
+ list = list->next;
+ }
+
+ return total;
+}
+
+
+/* Modifiers */
+
+scew_list*
+scew_list_append (scew_list *list, void *data)
+{
+ scew_list *item = NULL;
+
+ assert (data != NULL);
+
+ item = scew_list_create (data);
+
+ if ((item != NULL) && (list != NULL))
+ {
+ scew_list *last = scew_list_last (list);
+ last->next = item;
+ item->prev = last;
+ }
+
+ return item;
+}
+
+scew_list*
+scew_list_prepend (scew_list *list, void *data)
+{
+ scew_list *item = NULL;
+
+ assert (data != NULL);
+
+ item = scew_list_create (data);
+
+ if ((item != NULL) && (list != NULL))
+ {
+ scew_list *first = scew_list_first (list);
+ first->prev = item;
+ item->next = first;
+ }
+
+ return item;
+}
+
+scew_list*
+scew_list_delete (scew_list *list, void *data)
+{
+ scew_list *tmp = list;
+
+ assert (list != NULL);
+ assert (data != NULL);
+
+ while (tmp != NULL)
+ {
+ if (tmp->data != data)
+ {
+ tmp = tmp->next;
+ }
+ else
+ {
+ if (tmp->prev)
+ {
+ tmp->prev->next = tmp->next;
+ }
+ if (tmp->next)
+ {
+ tmp->next->prev = tmp->prev;
+ }
+
+ if (list == tmp)
+ {
+ list = list->next;
+ }
+ break;
+ }
+ }
+
+ return list;
+}
+
+scew_list*
+scew_list_delete_item (scew_list *list, scew_list *item)
+{
+ assert (list != NULL);
+
+ if (item != NULL)
+ {
+ if (item->prev != NULL)
+ {
+ item->prev->next = item->next;
+ }
+ if (item->next != NULL)
+ {
+ item->next->prev = item->prev;
+ }
+
+ if (item == list)
+ {
+ list = list->next;
+ }
+
+ free (item);
+ }
+
+ return list;
+}
+
+
+/* Traverse */
+
+scew_list*
+scew_list_first (scew_list *list)
+{
+ assert (list != NULL);
+
+ while (list->prev != NULL)
+ {
+ list = list->prev;
+ }
+
+ return list;
+}
+
+scew_list*
+scew_list_last (scew_list *list)
+{
+ assert (list != NULL);
+
+ while (list->next != NULL)
+ {
+ list = list->next;
+ }
+
+ return list;
+}
+
+scew_list*
+scew_list_next (scew_list *list)
+{
+ assert (list != NULL);
+
+ return list->next;
+}
+
+scew_list*
+scew_list_previous (scew_list *list)
+{
+ assert (list != NULL);
+
+ return list->prev;
+}
+
+scew_list*
+scew_list_index (scew_list *list, unsigned int index)
+{
+ unsigned int count = 0;
+
+ assert (list != NULL);
+
+ while ((list != NULL) && (count < index))
+ {
+ list = list->next;
+ ++count;
+ }
+
+ return list;
+}
+
+void
+scew_list_foreach (scew_list *list, scew_list_hook hook, void *user_data)
+{
+ assert (list != NULL);
+ assert (hook != NULL);
+
+ while (list != NULL)
+ {
+ hook (list, user_data);
+ list = list->next;
+ }
+}
+
+
+/* Search */
+
+scew_list*
+scew_list_find (scew_list *list, void *data)
+{
+ assert (list != NULL);
+ assert (data != NULL);
+
+ while (list != NULL)
+ {
+ if (list->data == data)
+ {
+ break;
+ }
+ list = list->next;
+ }
+
+ return list;
+}
+
+scew_list*
+scew_list_find_custom (scew_list *list,
+ void const *data,
+ scew_cmp_hook hook)
+{
+ assert (list != NULL);
+ assert (data != NULL);
+ assert (hook != NULL);
+
+ while (list != NULL)
+ {
+ if (hook (list->data, data))
+ {
+ break;
+ }
+ list = list->next;
+ }
+
+ return list;
+}
Property changes on: branches/R2_14/Externals/scew/scew/list.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/list.h
===================================================================
--- branches/R2_14/Externals/scew/scew/list.h (rev 0)
+++ branches/R2_14/Externals/scew/scew/list.h 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,342 @@
+/**
+ * @file list.h
+ * @brief SCEW general list implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Thu Jul 12, 2007 20:09
+ * @ingroup SCEWList, SCEWListAlloc, SCEWListAcc, SCEWListMod
+ * @ingroup SCEWListTrav, SCEWListSearch, SCEWList
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2007-2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ **/
+
+/**
+ * @defgroup SCEWList Lists
+ *
+ * This is a generic list implementation currenlty used by element's
+ * children and attributes, though, as a generic list, it can be used
+ * with any other type of data.
+ */
+
+#ifndef LIST_H_0707122009
+#define LIST_H_0707122009
+
+#include "export.h"
+
+#include "bool.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * This is the type delcaration for SCEW lists.
+ *
+ * @ingroup SCEWList
+ */
+typedef struct scew_list scew_list;
+
+/**
+ * SCEW lists hooks (functions) are used by #scew_list_foreach. The
+ * hook will be used to perform some custom action, defined by the
+ * hook, to every list item. These functions take two arguments, the
+ * list item where the action should be performed and an additional
+ * argument for any data that could be of use to the action.
+ *
+ * @param item the list item currently being traversed.
+ * @param user_data an optional user data pointer to be used by the
+ * hook (might be NULL).
+ *
+ * @ingroup SCEWList
+ */
+typedef void (*scew_list_hook) (scew_list *, void *);
+
+/**
+ * SCEW lists comparison hooks are used by #scew_list_find_custom. The
+ * hook takes the two arguments to be compared (of the same type).
+ *
+ * @return true if the given arguments are considered (by the provided
+ * comparison hook) equal, false otherwise.
+ *
+ * @ingroup SCEWList
+ */
+typedef scew_bool (*scew_cmp_hook) (void const *, void const *);
+
+
+/**
+ * @defgroup SCEWListAlloc Allocation
+ * Allocate and free new lists.
+ * @ingroup SCEWList
+ */
+
+/**
+ * Creates a new list item with the given @a data. Note that there is
+ * no difference between list items and lists, that is, a list item is
+ * a list itself.
+ *
+ * @pre data != NULL
+ *
+ * @return a new list, or NULL if the list could not be created.
+ *
+ * @ingroup SCEWListAlloc
+ */
+extern SCEW_API scew_list* scew_list_create (void *data);
+
+/**
+ * Frees all the items from the given @a list. The data pointers are
+ * not freed, thus they need to be freed separately.
+ *
+ * @ingroup SCEWListAlloc
+ */
+extern SCEW_API void scew_list_free (scew_list *list);
+
+
+/**
+ * @defgroup SCEWListAcc Accessors
+ * Access lists' data and information.
+ * @ingroup SCEWList
+ */
+
+/**
+ * Returns the data pointer of the given @a list item. Note that this
+ * routine does not know if the data pointed by the @a list item has
+ * been freed, so it might return a valid address without useful
+ * content.
+ *
+ * @pre list != NULL
+ *
+ * @return the data pointer for the given @a list.
+ *
+ * @ingroup SCEWListAcc
+ */
+extern SCEW_API void* scew_list_data (scew_list *list);
+
+/**
+ * Returns the number of items in the given @a list.
+ *
+ * @return the number of items in the given @a list or 0 if @a list is
+ * NULL.
+ *
+ * @ingroup SCEWListAcc
+ */
+extern SCEW_API unsigned int scew_list_size (scew_list *list);
+
+
+/**
+ * @defgroup SCEWListMod Modifiers
+ * Add and remove items from lists.
+ * @ingroup SCEWList
+ */
+
+/**
+ * Creates a new list item with the given @a data and appends it to @a
+ * list. If the given @a list is NULL this function acts like
+ * #scew_list_create.
+ *
+ * @pre data != NULL
+ *
+ * @return the item appended to @a list or NULL if an item could not
+ * be created.
+ *
+ * @ingroup SCEWListMod
+ */
+extern SCEW_API scew_list* scew_list_append (scew_list *list, void *data);
+
+/**
+ * Creates a new list item with the given @a data and prepends it to
+ * @a list. If the given @a list is NULL this function acts like
+ * #scew_list_create.
+ *
+ * @pre data != NULL
+ *
+ * @return the item prepended to @a list or NULL if an item could not
+ * be created.
+ *
+ * @ingroup SCEWListMod
+ */
+extern SCEW_API scew_list* scew_list_prepend (scew_list *list, void *data);
+
+/**
+ * Deletes the first item pointing to @a data from the given @a
+ * list. This function will search from the given item list, not from
+ * the beginning.
+ *
+ * @pre list != NULL
+ * @pre data != NULL
+ *
+ * @return @a list if the item found was not the first list item, or
+ * the new first item otherwise.
+ *
+ * @ingroup SCEWListMod
+ */
+extern SCEW_API scew_list* scew_list_delete (scew_list *list, void *data);
+
+/**
+ * Deletes the given list @a item from @a list.
+ *
+ * @pre list != NULL
+ *
+ * @return @a list if @a item was not the first list item, or the new
+ * first item otherwise.
+ *
+ * @ingroup SCEWListMod
+ */
+extern SCEW_API scew_list* scew_list_delete_item (scew_list *list,
+ scew_list *item);
+
+
+/**
+ * @defgroup SCEWListTrav Traverse
+ * Traverse list items.
+ * @ingroup SCEWList
+ */
+
+/**
+ * Finds the first item of the given @a list. This function traverses
+ * all the @a list backwards until it finds an item whose previous
+ * item is NULL.
+ *
+ * @pre list != NULL
+ *
+ * @return the first item of the given @a list or NULL if @a list is
+ * NULL.
+ *
+ * @ingroup SCEWListTrav
+ */
+extern SCEW_API scew_list* scew_list_first (scew_list *list);
+
+/**
+ * Finds the last item of the given @a list. This function traverses
+ * all the @a list forwards until it finds an item whose next item is
+ * NULL.
+ *
+ * @pre list != NULL
+ *
+ * @return the last item of the given @a list or NULL if @a list is
+ * NULL.
+ *
+ * @ingroup SCEWListTrav
+ */
+extern SCEW_API scew_list* scew_list_last (scew_list *list);
+
+/**
+ * Obtains the next item of the given @a list item.
+ *
+ * @pre list != NULL
+ *
+ * @return the next @a list item or NULL if @a list is the last item.
+ *
+ * @ingroup SCEWListTrav
+ */
+extern SCEW_API scew_list* scew_list_next (scew_list *list);
+
+/**
+ * Obtains the previous item of the given @a list item.
+ *
+ * @pre list != NULL
+ *
+ * @return the previous @a list item or NULL if @a list is the first
+ * item.
+ *
+ * @ingroup SCEWListTrav
+ */
+extern SCEW_API scew_list* scew_list_previous (scew_list *list);
+
+/**
+ * Gets the @a list item at the given @a index.
+ *
+ * @pre list != NULL
+ *
+ * @return the @a list item at @a index, or NULL if @a list does not
+ * contain sufficient items.
+ *
+ * @ingroup SCEWListSearch
+ */
+extern SCEW_API scew_list* scew_list_index (scew_list *list,
+ unsigned int index);
+
+/**
+ * Traverses all @a list items and executes the given @a hook for each
+ * item found. The hook takes an extra paramter, @a user_data, which
+ * might be NULL.
+ *
+ * @pre list != NULL
+ * @pre func != NULL
+ *
+ * @param list the list to traverse.
+ * @param hook the action to be executed for every traversed item.
+ * @param user_data an optional user data pointer (might be NULL).
+ *
+ * @ingroup SCEWListTrav
+ */
+extern SCEW_API void scew_list_foreach (scew_list *list,
+ scew_list_hook hook,
+ void *user_data);
+
+/**
+ * @defgroup SCEWListSearch Search
+ * Search for list items.
+ * @ingroup SCEWList
+ */
+
+/**
+ * Finds the first @a list item that contains @a data.
+ *
+ * @pre list != NULL
+ * @pre data != NULL
+ *
+ * @return the first @a list item that cointains @a data, or NULL if
+ * @a data is not found.
+ *
+ * @ingroup SCEWListSearch
+ */
+extern SCEW_API scew_list* scew_list_find (scew_list *list, void *data);
+
+/**
+ * Finds the first @a list item that matches the given predicate, @a
+ * hook. That is, all the @a list will be traversed calling the
+ * comparison hook for every @a list item. The comparison hook takes
+ * two parameters, the first one is the data of current traversed
+ * item, the second is @a data.
+ *
+ * @pre list != NULL
+ * @pre data != NULL
+ * @pre func != NULL
+ *
+ * @param list the list to traverse.
+ * @param data the user data to be used as one of the arguments for
+ * the comparison.
+ * @param hook the comparison function.
+ *
+ * @return the first @a list item that matches the predicate @a func,
+ * or NULL if the predicate is never true.
+ *
+ * @ingroup SCEWListSearch
+ */
+extern SCEW_API scew_list* scew_list_find_custom (scew_list *list,
+ void const *data,
+ scew_cmp_hook hook);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* LIST_H_0707122009 */
Property changes on: branches/R2_14/Externals/scew/scew/list.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/printer.c
===================================================================
--- branches/R2_14/Externals/scew/scew/printer.c (rev 0)
+++ branches/R2_14/Externals/scew/scew/printer.c 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,528 @@
+/**
+ * @file printer.c
+ * @brief printer.h implementation
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Fri Jan 16, 2009 22:38
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2003-2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ **/
+
+#include "printer.h"
+
+#include "xerror.h"
+
+#include "str.h"
+
+#include <assert.h>
+
+
+/* Private */
+
+#define STR_XML_ _XT("xml")
+#define STR_VERSION_ _XT("version")
+#define STR_ENCODING_ _XT("encoding")
+#define STR_STANDALONE_ _XT("standalone")
+#define STR_YES_ _XT("yes")
+#define STR_NO_ _XT("no")
+
+enum
+ {
+ DEFAULT_INDENT_SPACES_ = 3 /**< Default number of indent spaces */
+ };
+
+struct scew_printer
+{
+ scew_bool indented;
+ unsigned int indent;
+ unsigned int spaces;
+ scew_writer *writer;
+};
+
+static scew_bool print_pi_start_ (scew_printer *printer, XML_Char const *pi);
+static scew_bool print_pi_end_ (scew_printer *printer);
+static scew_bool print_attribute_ (scew_printer *printer,
+ XML_Char const* name,
+ XML_Char const* value);
+static scew_bool print_eol_ (scew_printer *printer);
+static scew_bool print_current_indent_ (scew_printer *printer);
+static scew_bool print_next_indent_ (scew_printer *printer);
+static scew_bool print_indent_ (scew_printer *printer, unsigned int indent);
+static scew_bool print_element_start_ (scew_printer *printer,
+ scew_element const *element,
+ scew_bool *closed);
+static scew_bool print_element_end_ (scew_printer *printer,
+ scew_element const *element);
+static scew_bool print_escaped_ (scew_printer *printer,
+ XML_Char const *string);
+
+
+/* Public */
+
+scew_printer*
+scew_printer_create (scew_writer *writer)
+{
+ scew_printer *printer = NULL;
+
+ assert (writer != NULL);
+
+ printer = calloc (1, sizeof (scew_printer));
+
+ if (printer != NULL)
+ {
+ printer->writer = writer;
+
+ scew_printer_set_indented (printer, SCEW_TRUE);
+ scew_printer_set_indentation (printer, DEFAULT_INDENT_SPACES_);
+ }
+
+ return printer;
+}
+
+void
+scew_printer_free (scew_printer *printer)
+{
+ if (printer != NULL)
+ {
+ free (printer);
+ }
+}
+
+scew_writer*
+scew_printer_set_writer (scew_printer *printer, scew_writer *writer)
+{
+ scew_writer *old_writer = NULL;
+
+ assert (printer != NULL);
+ assert (writer != NULL);
+
+ old_writer = printer->writer;
+ printer->writer = writer;
+
+ return old_writer;
+}
+
+void
+scew_printer_set_indented (scew_printer *printer, scew_bool indented)
+{
+ assert (printer != NULL);
+
+ printer->indented = indented;
+}
+
+void
+scew_printer_set_indentation (scew_printer *printer, unsigned int spaces)
+{
+ assert (printer != NULL);
+
+ printer->spaces = spaces;
+}
+
+scew_bool
+scew_printer_print_tree (scew_printer *printer, scew_tree const *tree)
+{
+ scew_bool result = SCEW_TRUE;
+ XML_Char const *version = NULL;
+ XML_Char const *encoding = NULL;
+ XML_Char const *preamble = NULL;
+ scew_tree_standalone standalone = scew_tree_standalone_unknown;
+
+ assert (printer != NULL);
+ assert (tree != NULL);
+
+ version = scew_tree_xml_version (tree);
+ encoding = scew_tree_xml_encoding (tree);
+ standalone = scew_tree_xml_standalone (tree);
+ preamble = scew_tree_xml_preamble (tree);
+
+ /* Start XML declaration. */
+ result = print_pi_start_ (printer, STR_XML_);
+ result = result && print_attribute_ (printer, STR_VERSION_, version);
+
+ if (encoding)
+ {
+ result = result && print_attribute_ (printer, STR_ENCODING_, encoding);
+ }
+
+ if (result)
+ {
+ switch (standalone)
+ {
+ case scew_tree_standalone_unknown:
+ break;
+ case scew_tree_standalone_no:
+ result = print_attribute_ (printer, STR_STANDALONE_, STR_NO_);
+ break;
+ case scew_tree_standalone_yes:
+ result = print_attribute_ (printer, STR_STANDALONE_, STR_YES_);
+ break;
+ };
+ }
+
+ /* End XML declaration. */
+ result = result && print_pi_end_ (printer) && print_eol_ (printer);
+
+ /* XML preamble (DOCTYPE...). */
+ if (preamble != NULL)
+ {
+ result = result && scew_writer_write (printer->writer,
+ preamble,
+ scew_strlen (preamble));
+ result = result && print_eol_ (printer);
+ result = result && print_eol_ (printer);
+ }
+
+ /* Print XML document. */
+ result = result && scew_printer_print_element (printer,
+ scew_tree_root (tree));
+
+ if (!result)
+ {
+ scew_error_set_last_error_ (scew_error_io);
+ }
+
+ return result;
+}
+
+scew_bool
+scew_printer_print_element (scew_printer *printer, scew_element const *element)
+{
+ scew_bool result = SCEW_TRUE;
+ scew_bool closed = SCEW_TRUE;
+
+ assert (printer != NULL);
+ assert (element != NULL);
+
+ result = print_element_start_ (printer, element, &closed);
+
+ if (!closed)
+ {
+ XML_Char const *contents = scew_element_contents (element);
+
+ if (contents != NULL)
+ {
+ unsigned int children_no = scew_element_count (element);
+
+ /* Only indent contents if we have children elements. */
+ if (children_no > 0)
+ {
+ result = result && print_next_indent_ (printer);
+ }
+
+ /* Only write contents if non zero-length string. */
+ if (scew_strlen (contents) > 0)
+ {
+ result = result && print_escaped_ (printer, contents);
+ }
+
+ if (children_no > 0)
+ {
+ result = result && print_eol_ (printer);
+ }
+ }
+
+ result = result && scew_printer_print_element_children (printer,
+ element);
+ result = result && print_element_end_ (printer, element);
+ result = result && print_eol_ (printer);
+ }
+
+ if (!result)
+ {
+ scew_error_set_last_error_ (scew_error_io);
+ }
+
+ return result;
+}
+
+scew_bool
+scew_printer_print_element_children (scew_printer *printer,
+ scew_element const *element)
+{
+ unsigned int indent = 0;
+ scew_list *list = NULL;
+ scew_bool result = SCEW_TRUE;
+
+ assert (printer != NULL);
+ assert (element != NULL);
+
+ indent = printer->indent;
+
+ list = scew_element_children (element);
+ while (result && (list != NULL))
+ {
+ scew_element *child = scew_list_data (list);
+
+ printer->indent = indent + 1;
+
+ result = scew_printer_print_element (printer, child);
+ list = scew_list_next (list);
+ }
+
+ printer->indent = indent;
+
+ if (!result)
+ {
+ scew_error_set_last_error_ (scew_error_io);
+ }
+
+ return result;
+}
+
+
+scew_bool
+scew_printer_print_element_attributes (scew_printer *printer,
+ scew_element const *element)
+{
+ scew_bool result = SCEW_TRUE;
+ scew_list *list = NULL;
+
+ assert (printer != NULL);
+ assert (element != NULL);
+
+ list = scew_element_attributes (element);
+ while (result && (list != NULL))
+ {
+ scew_attribute *attribute = scew_list_data (list);
+ result = scew_printer_print_attribute (printer, attribute);
+ list = scew_list_next (list);
+ }
+
+ if (!result)
+ {
+ scew_error_set_last_error_ (scew_error_io);
+ }
+
+ return result;
+}
+
+scew_bool
+scew_printer_print_attribute (scew_printer *printer,
+ scew_attribute const *attribute)
+{
+ scew_bool result = SCEW_TRUE;
+
+ assert (printer != NULL);
+ assert (attribute != NULL);
+
+ result = print_attribute_ (printer,
+ scew_attribute_name (attribute),
+ scew_attribute_value (attribute));
+
+ if (!result)
+ {
+ scew_error_set_last_error_ (scew_error_io);
+ }
+
+ return result;
+}
+
+
+
+/* Private */
+
+scew_bool
+print_pi_start_ (scew_printer *printer, XML_Char const *pi)
+{
+ static XML_Char const *PI_START = _XT("<?");
+ scew_bool result = SCEW_FALSE;
+
+ scew_writer *writer = printer->writer;
+
+ result = scew_writer_write (writer, PI_START, scew_strlen (PI_START));
+ result = result && scew_writer_write (writer, pi, scew_strlen (pi));
+
+ return result;
+}
+
+scew_bool
+print_pi_end_ (scew_printer *printer)
+{
+ static XML_Char const *PI_END = _XT("?>");
+ scew_bool result = SCEW_FALSE;
+
+ result = scew_writer_write (printer->writer, PI_END, scew_strlen (PI_END));
+ result = result && print_eol_ (printer);
+
+ return result;
+}
+
+scew_bool
+print_attribute_ (scew_printer *printer,
+ XML_Char const* name,
+ XML_Char const* value)
+{
+ scew_bool result = SCEW_FALSE;
+
+ scew_writer *writer = printer->writer;
+
+ result = scew_writer_write (writer, _XT(" "), 1);
+ result = result && scew_writer_write (writer, name, scew_strlen (name));
+ result = result && scew_writer_write (writer, _XT("=\""), 2);
+
+ /* It is possible that an attribute's value is empty. */
+ if (scew_strlen (value) > 0)
+ {
+ result = result && print_escaped_ (printer, value);
+ }
+
+ result = result && scew_writer_write (writer, _XT("\""), 1);
+
+ return result;
+}
+
+scew_bool
+print_eol_ (scew_printer *printer)
+{
+ scew_bool result = SCEW_TRUE;
+
+ assert (printer != NULL);
+
+ if (printer->indented)
+ {
+ result = scew_writer_write (printer->writer, _XT("\n"), 1);
+ }
+
+ return result;
+}
+
+scew_bool
+print_current_indent_ (scew_printer *printer)
+{
+ return print_indent_ (printer, printer->indent);
+}
+
+scew_bool
+print_next_indent_ (scew_printer *printer)
+{
+ return print_indent_ (printer, printer->indent + 1);
+}
+
+scew_bool
+print_indent_ (scew_printer *printer, unsigned int indent)
+{
+ scew_bool result = SCEW_TRUE;
+
+ assert (printer != NULL);
+
+ if (printer->indented)
+ {
+ unsigned int i = 0;
+ unsigned int spaces = indent * printer->spaces;
+ for (i = 0; result && (i < spaces); ++i)
+ {
+ result = scew_writer_write (printer->writer, _XT(" "), 1);
+ }
+ }
+
+ return result;
+}
+
+scew_bool
+print_element_start_ (scew_printer *printer,
+ scew_element const *element,
+ scew_bool *closed)
+{
+ static XML_Char const *START = _XT("<");
+ static XML_Char const *END_1 = _XT(">");
+ static XML_Char const *END_2 = _XT("/>");
+
+ scew_list *list = NULL;
+ scew_writer *writer = NULL;
+ XML_Char const *name = NULL;
+ XML_Char const *contents = NULL;
+ scew_bool result = SCEW_TRUE;
+
+ assert (printer != NULL);
+ assert (element != NULL);
+
+ writer = printer->writer;
+
+ name = scew_element_name (element);
+
+ result = print_current_indent_ (printer);
+ result = result && scew_writer_write (writer, START, 1);
+ result = result && scew_writer_write (writer, name, scew_strlen (name));
+ result = result && scew_printer_print_element_attributes (printer, element);
+
+ contents = scew_element_contents (element);
+
+ *closed = SCEW_FALSE;
+ list = scew_element_children (element);
+ if (((NULL == contents) || (scew_strlen (contents) == 0)) && (NULL == list))
+ {
+ result = result && scew_writer_write (writer, END_2, 2);
+ result = result && print_eol_ (printer);
+ *closed = SCEW_TRUE;
+ }
+ else
+ {
+ result = result && scew_writer_write (writer, END_1, 1);
+ if (list != NULL)
+ {
+ result = result && print_eol_ (printer);
+ }
+ }
+
+ return result;
+}
+
+scew_bool
+print_element_end_ (scew_printer *printer, scew_element const *element)
+{
+ static XML_Char const *START = _XT("</");
+ static XML_Char const *END = _XT(">");
+
+ scew_writer *writer = NULL;
+ scew_bool result = SCEW_TRUE;
+
+ XML_Char const *name = scew_element_name (element);
+
+ assert (printer != NULL);
+
+ writer = printer->writer;
+
+ if (scew_element_count (element) > 0)
+ {
+ result = print_current_indent_ (printer);
+ }
+ result = result && scew_writer_write (writer, START, 2);
+ result = result && scew_writer_write (writer, name, scew_strlen (name));
+ result = result && scew_writer_write (writer, END, 1);
+
+ return result;
+}
+
+scew_bool
+print_escaped_ (scew_printer *printer, XML_Char const *string)
+{
+ scew_bool result = SCEW_TRUE;
+
+ /* Get escaped string. */
+ XML_Char *escaped = scew_strescape (string);
+
+ result = scew_writer_write (printer->writer, escaped, scew_strlen (escaped));
+
+ /* Free escaped string. */
+ free (escaped);
+
+ return result;
+}
Property changes on: branches/R2_14/Externals/scew/scew/printer.c
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/R2_14/Externals/scew/scew/printer.h
===================================================================
--- branches/R2_14/Externals/scew/scew/printer.h (rev 0)
+++ branches/R2_14/Externals/scew/scew/printer.h 2010-11-01 14:59:25 UTC (rev 7402)
@@ -0,0 +1,256 @@
+/**
+ * @file printer.h
+ * @brief SCEW printer routines for XML output
+ * @author Aleix Conchillo Flaque <al...@me...>
+ * @date Fri Jan 16, 2009 22:34
+ * @ingroup SCEWPrinter, SCEWPrinterAlloc, SCEWPrinterProp, SCEWPrinterOutput
+ *
+ * @if copyright
+ *
+ * Copyright (C) 2009 Aleix Conchillo Flaque
+ *
+ * SCEW 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.
+ *
+ * SCEW 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 Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * @endif
+ **/
+
+/**
+ * @defgroup SCEWIO Input/Output
+ *
+ * The SCEW I/O system is based on SCEW @ref SCEWReader, @ref
+ * SCEWWriter and @ref SCEWPrinter. A reader is a common mechanism to
+ * load data from different sources (files, memory, ...). A common
+ * mechanism means that the functions to read data, for example, from
+ * a file or from a memory buffer, are the same. SCEW writers follows
+ * the same idea behind the readers, that is, common routines are used
+ * to write data to any kind of sources (files, memory, ...).
+ *
+ * It is worth mentioning that a user might implement its own SCEW
+ * readers and writers.
+ *
+ * The SCEW printer provides routines to write SCEW XML data (trees,
+ * elements and attributes) to a SCEW writer.
+ */
+
+/**
+ * @defgroup SCEWPrinter Printer
+ *
+ * A SCEW printer provides a set of routines to send XML data to a
+ * given SCEW writer.
+ *
+ * @ingroup SCEWIO
+ */
+
+#ifndef PRINTER_H_0901162234
+#define PRINTER_H_0901162234
+
+#include "export.h"
+
+#include "writer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * This is the type delcaration for the SCEW printer.
+ *
+ * @ingroup SCEWPrinter
+ */
+typedef struct scew_printer scew_printer;
+
+
+/**
+ * @defgroup SCEWPrinterAlloc Allocation
+ * Allocate and free printers.
+ * @ingroup SCEWPrinter
+ */
+
+/**
+ * Creates a new SCEW printer that will use the given @a writer by
+ * default. The SCEW writer will be used by the @ref SCEWPrinterOutput
+ * calls. It is possible to re-use a SCEW printer by setting a new
+ * writer via #scew_printer_set_writer.
+ *
+ * @pre writer != NULL
+ *
+ * @param writer the SCEW writer to be used by the putput functions.
+ *
+ * @return a new SCEW printer or NULL if the printer could not be
+ * created.
+ *
+ * @ingroup SCEWPrinterAlloc
+ */
+extern SCEW_API scew_printer* scew_printer_create (scew_writer *writer);
+
+/**
+ * Frees the given SCEW @a printer. This will not free the writer
+ * being used by the printer.
+ *
+ * @param printer the SCEW printer to free.
+ *
+ * @ingroup SCEWPrinterAlloc
+ */
+extern SCEW_API void scew_printer_free (scew_printer *printer);
+
+
+/**
+ * @defgroup SCEWPrinterProp Properties
+ * Set printer properties.
+ * @ingroup SCEWPrinter
+ */
+
+/**
+ * Tells whether the output sent to the given SCEW @a printer should be
+ * @a indented or not.
+ *
+ * @pre printer != NULL
+ *
+ * @param printer the SCEW printer to change its indentation for.
+ * @param indented true if the output should be indented, false
+ * otherwise.
+ *
+ * @ingroup SCEWPrinterProp
+ */
+extern SCEW_API void scew_printer_set_indented (scew_printer *printer,
+ scew_bool indented);
+
+/**
+ * Sets the number of @a spaces to use when indenting output for the
+ * given SCEW @a printer.
+ *
+ * @pre printer != NULL
+ *
+ * @param printer the SCEW printer to change its indentation spaces for.
+ * @param spaces the number of spaces to use for indentation.
+ *
+ * @ingroup SCEWPrinterProp
+ */
+extern SCEW_API void scew_printer_set_indentation (scew_printer *printer,
+ unsigned int spaces);
+
+
+/**
+ * @defgroup SCEWPrinterOutput Output
+ * A set of routines to print XML data.
+ * @ingroup SCEWPrinter
+ */
+
+/**
+ * Sets the given SCEW @a writer to the specified @a printer. After
+ * this call, subsequent calls to output functions will use the given
+ * writer internally. This means that the printer can be used to
+ * writer to a file or memory buffer indistinctly.
+ *
+ * @param printer the SCEW printer to change its writer for.
+ * @param writer the SCEW writer to be used in next...
[truncated message content] |
|
From: <ge...@us...> - 2010-11-01 14:04:24
|
Revision: 7401
http://winmerge.svn.sourceforge.net/winmerge/?rev=7401&view=rev
Author: gerundt
Date: 2010-11-01 14:04:18 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Drop Heksedit from versions.txt in Externals directory
Modified Paths:
--------------
branches/R2_14/Externals/versions.txt
Modified: branches/R2_14/Externals/versions.txt
===================================================================
--- branches/R2_14/Externals/versions.txt 2010-11-01 13:51:46 UTC (rev 7400)
+++ branches/R2_14/Externals/versions.txt 2010-11-01 14:04:18 UTC (rev 7401)
@@ -5,5 +5,4 @@
Expat: 2.0.1
PCRE: 8.10
-Heksedit: Frhed SVN trunk r 45
-SCEW: 1.1.2
\ No newline at end of file
+SCEW: 1.1.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-01 13:51:54
|
Revision: 7400
http://winmerge.svn.sourceforge.net/winmerge/?rev=7400&view=rev
Author: gerundt
Date: 2010-11-01 13:51:46 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
PATCH: [ 3061941 ] Drop X64 * configs from x64 project
Modified Paths:
--------------
branches/R2_14/Src/MergeLangX64.vcproj
branches/R2_14/Src/MergeX64.vcproj
branches/R2_14/WinMergeX64.sln
Modified: branches/R2_14/Src/MergeLangX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeLangX64.vcproj 2010-11-01 13:43:17 UTC (rev 7399)
+++ branches/R2_14/Src/MergeLangX64.vcproj 2010-11-01 13:51:46 UTC (rev 7400)
@@ -341,328 +341,6 @@
CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
- <Configuration
- Name="X64 Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
- SubSystem="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="X64 Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
- SubSystem="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="X64 Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="X64 Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
</Configurations>
<References>
</References>
@@ -706,42 +384,6 @@
Outputs="Languages\MergeLang.rc"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\Languages\MergeLang.rc"
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-11-01 13:43:17 UTC (rev 7399)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-11-01 13:51:46 UTC (rev 7400)
@@ -409,396 +409,6 @@
CommandLine=""
/>
</Configuration>
- <Configuration
- Name="X64 Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="0"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
- GenerateDebugInformation="true"
- SubSystem="2"
- EntryPointSymbol="wWinMainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="X64 Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- CommandLine=""
- Outputs="$(TargetDir)WinMergeU.map"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="0"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\X64\MergeUnicodeDebug/WinMergeU.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
- GenerateDebugInformation="true"
- SubSystem="2"
- EntryPointSymbol="wWinMainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="X64 Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- EntryPointSymbol="wWinMainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="X64 Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- CommandLine=""
- Outputs="$(TargetDir)WinMergeU.map"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\X64\MergeUnicodeRelease\WinMergeU.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- EntryPointSymbol="wWinMainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
</Configurations>
<References>
</References>
@@ -852,48 +462,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="AboutDlg.cpp"
@@ -940,48 +508,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\AnsiConvert.cpp"
@@ -1018,38 +544,6 @@
UsePrecompiledHeader="0"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="BCMenu.cpp"
@@ -1096,48 +590,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\Bitmap.cpp"
@@ -1188,48 +640,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="charsets.c"
@@ -1280,52 +690,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="ChildFrm.cpp"
@@ -1372,48 +736,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\ClipBoard.cpp"
@@ -1460,48 +782,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\CMoveConstraint.cpp"
@@ -1548,48 +828,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="codepage.cpp"
@@ -1636,48 +874,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="codepage_detect.cpp"
@@ -1724,48 +920,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ColorButton.cpp"
@@ -1812,48 +966,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareOptions.cpp"
@@ -1912,60 +1024,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareStatisticsDlg.cpp"
@@ -2012,48 +1070,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareStats.cpp"
@@ -2112,60 +1128,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConfigLog.cpp"
@@ -2212,48 +1174,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConfirmFolderCopyDlg.cpp"
@@ -2300,48 +1220,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConflictFileParser.cpp"
@@ -2388,48 +1266,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\coretools.cpp"
@@ -2480,52 +1316,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="common\CShellFileOp.cpp"
@@ -2572,48 +1362,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\CSubclass.cpp"
@@ -2660,48 +1408,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffContext.cpp"
@@ -2748,48 +1454,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffFileData.cpp"
@@ -2836,48 +1500,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffFileInfo.cpp"
@@ -2924,48 +1546,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffItem.cpp"
@@ -3012,48 +1592,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffItemList.cpp"
@@ -3108,54 +1646,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffList.cpp"
@@ -3202,48 +1692,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\DiffTextBuffer.cpp"
@@ -3294,48 +1742,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffViewBar.cpp"
@@ -3382,48 +1788,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffWrapper.cpp"
@@ -3470,48 +1834,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
-...
[truncated message content] |
|
From: <ge...@us...> - 2010-11-01 13:43:23
|
Revision: 7399
http://winmerge.svn.sourceforge.net/winmerge/?rev=7399&view=rev
Author: gerundt
Date: 2010-11-01 13:43:17 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
PATCH: [ 3095046 ] Drop Ansi config from x86 project - Forgot to remove two lines in WinMerge.sln
Modified Paths:
--------------
branches/R2_14/WinMerge.sln
Modified: branches/R2_14/WinMerge.sln
===================================================================
--- branches/R2_14/WinMerge.sln 2010-11-01 13:32:09 UTC (rev 7398)
+++ branches/R2_14/WinMerge.sln 2010-11-01 13:43:17 UTC (rev 7399)
@@ -4,8 +4,6 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
UnicodeDebug|Win32 = UnicodeDebug|Win32
UnicodeRelease|Win32 = UnicodeRelease|Win32
EndGlobalSection
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-11-01 13:32:18
|
Revision: 7398
http://winmerge.svn.sourceforge.net/winmerge/?rev=7398&view=rev
Author: gerundt
Date: 2010-11-01 13:32:09 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
PATCH: [ 3059318 ] Drop Ansi config from x64 project
Modified Paths:
--------------
branches/R2_14/Src/MergeLangX64.vcproj
branches/R2_14/Src/MergeX64.vcproj
branches/R2_14/WinMergeX64.sln
Modified: branches/R2_14/Src/MergeLangX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeLangX64.vcproj 2010-11-01 12:25:55 UTC (rev 7397)
+++ branches/R2_14/Src/MergeLangX64.vcproj 2010-11-01 13:32:09 UTC (rev 7398)
@@ -20,328 +20,6 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\Build\MergeDebug"
- IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
- SubSystem="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory=".\..\Build\$(PlatformName)\Merge$(ConfigurationName)"
- IntermediateDirectory=".\..\BuildTmp\MergeLang\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
- SubSystem="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\Build\Merge$(ConfigurationName)"
- IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory=".\..\Build\$(PlatformName)\Merge$(ConfigurationName)"
- IntermediateDirectory=".\..\BuildTmp\MergeLang\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/MergeLang.dll"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ResourceOnlyDLL="true"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)/MergeLang.lib"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
- />
- </Configuration>
- <Configuration
Name="UnicodeDebug|Win32"
OutputDirectory=".\..\Build\MergeUnicodeDebug"
IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
@@ -419,7 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -501,7 +179,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -580,7 +258,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -660,7 +338,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -741,7 +419,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -823,7 +501,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -902,7 +580,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -982,7 +660,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
</Configurations>
@@ -993,42 +671,6 @@
RelativePath=".\Merge.rc"
>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="cd Languages
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
- />
- </FileConfiguration>
- <FileConfiguration
Name="UnicodeDebug|Win32"
>
<Tool
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-11-01 12:25:55 UTC (rev 7397)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-11-01 13:32:09 UTC (rev 7398)
@@ -410,388 +410,6 @@
/>
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\BuildTmp\MergeDebug"
- IntermediateDirectory=".\..\BuildTmp\MergeDebug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="0"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="4"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\MergeDebug/WinMerge.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
- IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="0"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\X64\MergeDebug/WinMerge.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\BuildTmp\MergeRelease"
- IntermediateDirectory=".\..\BuildTmp\MergeRelease"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\MergeRelease/WinMerge.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
- IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="3"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/EHa "
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
- PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
- OutputFile="..\Build\X64\MergeRelease/WinMerge.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
- IgnoreDefaultLibraryNames="msvcrtd.lib"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- EmbedManifest="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine=""
- />
- </Configuration>
- <Configuration
Name="X64 Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
@@ -1235,48 +853,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1365,48 +941,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1485,38 +1019,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1595,48 +1097,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1729,48 +1189,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -1863,52 +1281,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2001,48 +1373,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2131,48 +1461,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2261,48 +1549,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2391,48 +1637,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
Name="X64 Debug|Win32"
>
<Tool
@@ -2521,48 +1725,6 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInfo...
[truncated message content] |
|
From: <ge...@us...> - 2010-11-01 12:26:02
|
Revision: 7397
http://winmerge.svn.sourceforge.net/winmerge/?rev=7397&view=rev
Author: gerundt
Date: 2010-11-01 12:25:55 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Drop heksedit from WinMergeX64.sln in R2_14
Modified Paths:
--------------
branches/R2_14/WinMergeX64.sln
Modified: branches/R2_14/WinMergeX64.sln
===================================================================
--- branches/R2_14/WinMergeX64.sln 2010-11-01 11:53:31 UTC (rev 7396)
+++ branches/R2_14/WinMergeX64.sln 2010-11-01 12:25:55 UTC (rev 7397)
@@ -18,8 +18,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit", "Externals\heksedit\hekseditX64.vcproj", "{15EE10B9-011A-4781-ACBC-22F1CFEB5610}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Unicode|Win32 = Debug Unicode|Win32
@@ -156,30 +154,6 @@
{4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|Win32.Build.0 = X64 Release|Win32
{4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|x64.ActiveCfg = X64 Release|x64
{4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|x64.Build.0 = X64 Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|Win32.ActiveCfg = Debug|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|Win32.Build.0 = Debug|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|x64.ActiveCfg = Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|x64.Build.0 = Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|Win32.ActiveCfg = Debug|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|Win32.Build.0 = Debug|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|x64.ActiveCfg = Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|x64.Build.0 = Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|Win32.ActiveCfg = Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|Win32.Build.0 = Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|x64.ActiveCfg = Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|x64.Build.0 = Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|Win32.ActiveCfg = Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|Win32.Build.0 = Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|x64.ActiveCfg = Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|x64.Build.0 = Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|Win32.ActiveCfg = X64 Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|Win32.Build.0 = X64 Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|x64.ActiveCfg = X64 Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|x64.Build.0 = X64 Debug|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|Win32.ActiveCfg = X64 Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|Win32.Build.0 = X64 Release|Win32
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|x64.ActiveCfg = X64 Release|x64
- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|x64.Build.0 = X64 Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-11-01 11:53:37
|
Revision: 7396
http://winmerge.svn.sourceforge.net/winmerge/?rev=7396&view=rev
Author: jtuc
Date: 2010-11-01 11:53:31 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Set Merge7zInstaller's UAC execution level to RequireAdministrator
Modified Paths:
--------------
trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj
Modified: trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj
===================================================================
--- trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj 2010-11-01 11:50:12 UTC (rev 7395)
+++ trunk/ArchiveSupport/Merge7zInstaller/Merge7zInstaller.vcxproj 2010-11-01 11:53:31 UTC (rev 7396)
@@ -70,6 +70,7 @@
<ProgramDatabaseFile>.\..\..\Build\Merge7zInstaller\Debug/Merge7zInstaller.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link>
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -126,6 +127,7 @@
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
</Link>
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-11-01 11:50:18
|
Revision: 7395
http://winmerge.svn.sourceforge.net/winmerge/?rev=7395&view=rev
Author: jtuc
Date: 2010-11-01 11:50:12 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Add versions 7z915 through 7z917 to Merge7zInstaller
Modified Paths:
--------------
trunk/ArchiveSupport/Merge7zInstaller/Files.rc2
Modified: trunk/ArchiveSupport/Merge7zInstaller/Files.rc2
===================================================================
--- trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 2010-11-01 11:39:37 UTC (rev 7394)
+++ trunk/ArchiveSupport/Merge7zInstaller/Files.rc2 2010-11-01 11:50:12 UTC (rev 7395)
@@ -21,6 +21,12 @@
MERGE7ZU(Merge7z913U.dll)
MERGE7Z(Merge7z914.dll)
MERGE7ZU(Merge7z914U.dll)
+MERGE7Z(Merge7z915.dll)
+MERGE7ZU(Merge7z915U.dll)
+MERGE7Z(Merge7z916.dll)
+MERGE7ZU(Merge7z916U.dll)
+MERGE7Z(Merge7z917.dll)
+MERGE7ZU(Merge7z917U.dll)
VIIZIP(7zip_pad.xml)
VIIZIP(7z.dll)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
