From 44651c11dfc1fb8a7b32e651ffe46b4fbb82110e Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 9 Dec 2008 22:33:18 +0800 Subject: [PATCH] release build succesful Signed-off-by: Frank Li --- src/Git/Git.vcproj | 1 + .../{FeaturesFragment.wxs => FeaturesFragment.wxi} | 12 +- src/TortoiseGitSetup/Includes.wxi | 193 ++++----- src/TortoiseGitSetup/License.rtf | 85 ++-- src/TortoiseGitSetup/StructureFragment.wxi | 464 +++++++++++++++++++++ src/TortoiseGitSetup/StructureFragment.wxs | 455 -------------------- src/TortoiseGitSetup/SubWCRev.wxs | 2 +- src/TortoiseGitSetup/TortoiseSVN.wxs | 41 +- .../{UIFragment.wxs => UIFragment.wxi} | 12 +- src/TortoiseGitSetup/VersionNumberInclude.wxi | 2 +- src/TortoiseGitSetup/WiXSetup.wixproj | 92 ++-- src/TortoiseGitSetup/WixUI_Simplest.wxs | 2 +- src/TortoiseProc/CheckoutDlg.h | 10 +- src/TortoiseProc/Commands/CloneCommand.cpp | 4 + src/TortoiseProc/TortoiseProc.vcproj | 32 +- src/TortoiseProc/gitstatuslistctrl.cpp | 11 - src/TortoiseShell/TortoiseShell.vcproj | 2 +- src/Utils/Utils.vcproj | 1 + 18 files changed, 715 insertions(+), 706 deletions(-) rename src/TortoiseGitSetup/{FeaturesFragment.wxs => FeaturesFragment.wxi} (91%) create mode 100644 src/TortoiseGitSetup/StructureFragment.wxi delete mode 100644 src/TortoiseGitSetup/StructureFragment.wxs rename src/TortoiseGitSetup/{UIFragment.wxs => UIFragment.wxi} (98%) delete mode 100644 src/TortoiseProc/gitstatuslistctrl.cpp diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj index 1c9dbe5..98377f9 100644 --- a/src/Git/Git.vcproj +++ b/src/Git/Git.vcproj @@ -108,6 +108,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="../utils" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxs b/src/TortoiseGitSetup/FeaturesFragment.wxi similarity index 91% rename from src/TortoiseGitSetup/FeaturesFragment.wxs rename to src/TortoiseGitSetup/FeaturesFragment.wxi index b8d68d8..982fba1 100644 --- a/src/TortoiseGitSetup/FeaturesFragment.wxs +++ b/src/TortoiseGitSetup/FeaturesFragment.wxi @@ -1,8 +1,7 @@ - - - - + + + @@ -80,5 +79,4 @@ DO NOT INSTALL THIS FEATURE if you don't use VS.NET with Web Projects!!!" - - + \ No newline at end of file diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi index f5c42f1..f8ddd52 100644 --- a/src/TortoiseGitSetup/Includes.wxi +++ b/src/TortoiseGitSetup/Includes.wxi @@ -6,17 +6,17 @@ - + - - - - - + + + + + - + @@ -26,123 +26,124 @@ - + - + - + - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - + - + - + - - + + - - - - - + + + + + - - + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TortoiseGitSetup/License.rtf b/src/TortoiseGitSetup/License.rtf index 08f517d..bc2b9b4 100644 --- a/src/TortoiseGitSetup/License.rtf +++ b/src/TortoiseGitSetup/License.rtf @@ -1,47 +1,38 @@ -{\rtf1\ansi\ansicpg1252 -{\fonttbl {\f0\fswiss\fcharset0 Arial;}} -\f0\sa100\fs18\lang1033 - -Copyright (C) 2003-2008 - TortoiseSVN - -\par\ql -TortoiseSVN is free. You don't have to pay for it, and you can use it -any way you want. It is developed as an Open Source project under the -GNU General Public License (GPL). That means you have full access to -the source code of this program. You can find it on our website at -http://tortoisesvn.tigris.org - -\par -Should you wish to modify or redistribute this program, or any part of it, -you should read the full terms and conditions set out in the license -agreement before doing so. A copy of the license is available on our website. - -\par -If you simply wish to install and use this software, you need only be aware of -the disclaimer conditions in the license, which are set out below. - -\par\b -NO WARRANTY - -\par\b0 -Because the program is licensed free of charge, there is no warranty -for the program, to the extent permitted by applicable law. Except when -otherwise stated in writing the copyright holders and/or other parties -provide the program "as is" without warranty of any kind, either expressed -or implied, including, but not limited to, the implied warranties of -merchantability and fitness for a particular purpose. The entire risk as -to the quality and performance of the program is with you. Should the -program prove defective, you assume the cost of all necessary servicing, -repair or correction. - -\par -In no event unless required by applicable law or agreed to in writing -will any copyright holder, or any other party who may modify and/or -redistribute the program as permitted above, be liable to you for damages, -including any general, special, incidental or consequential damages arising -out of the use or inability to use the program (including but not limited -to loss of data or data being rendered inaccurate or losses sustained by -you or third parties or a failure of the program to operate with any other -programs), even if such holder or other party has been advised of the -possibility of such damages. -} +{\rtf1\adeflang1025\ansi\ansicpg1252\uc2\adeff0\deff0\stshfdbch13\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe2052{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} +{\f13\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'cb\'ce\'cc\'e5{\*\falt SimSun};}{\f37\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@\'cb\'ce\'cc\'e5;}{\f38\froman\fcharset238\fprq2 Times New Roman CE;} +{\f39\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f41\froman\fcharset161\fprq2 Times New Roman Greek;}{\f42\froman\fcharset162\fprq2 Times New Roman Tur;}{\f43\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f44\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f45\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f46\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f48\fswiss\fcharset238\fprq2 Arial CE;} +{\f49\fswiss\fcharset204\fprq2 Arial Cyr;}{\f51\fswiss\fcharset161\fprq2 Arial Greek;}{\f52\fswiss\fcharset162\fprq2 Arial Tur;}{\f53\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f54\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} +{\f55\fswiss\fcharset186\fprq2 Arial Baltic;}{\f56\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f170\fnil\fcharset0\fprq2 SimSun Western{\*\falt SimSun};}{\f410\fnil\fcharset0\fprq2 @\'cb\'ce\'cc\'e5 Western;}}{\colortbl;\red0\green0\blue0; +\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128; +\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 +\fs24\lang1033\langfe2052\loch\f0\hich\af0\dbch\af13\cgrid\langnp1033\langfenp2052 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv +\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}} +{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid5258405\rsid16059667}{\*\generator Microsoft Word 11.0.0000;}{\info{\operator Frank Li}{\creatim\yr2008\mo12\dy8\hr14\min57}{\revtim\yr2008\mo12\dy8\hr14\min57}{\version2}{\edmins0}{\nofpages1} +{\nofwords288}{\nofchars1643}{\nofcharsws1928}{\vern24613}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\donotembedsysfont0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3 +\jcompress\viewkind1\viewscale150\rsidroot5258405 \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl2 +\pnucltr\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta \hich )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb \hich (} +{\pntxta \hich )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \hich (} +{\pntxta \hich )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}\pard\plain \ltrpar\ql \li0\ri0\sa100\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 +\fs24\lang1033\langfe2052\loch\af0\hich\af0\dbch\af13\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 Copyright (C) 2003-2008 - Tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 +\f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 GIT}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 +\par \hich\af1\dbch\af13\loch\f1 Tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 GIT}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 + is free. You don't have to pay for it, and you can use it any way you want. It is developed as an Open Source project under the GNU General Public License (GPL). That means you have full access to \hich\af1\dbch\af13\loch\f1 +the source code of this program. You can find it on our website at http://tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 Git}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 +\hich\af1\dbch\af13\loch\f1 .tigris.org +\par \hich\af1\dbch\af13\loch\f1 Should you wish to modify or redistribute this program, or any part of it, you should read the full terms and conditions set out in the license agreement befor\hich\af1\dbch\af13\loch\f1 +e doing so. A copy of the license is available on our website. +\par \hich\af1\dbch\af13\loch\f1 If you simply wish to install and use this software, you need only be aware of the disclaimer conditions in the license, which are set out below. +\par }{\rtlch\fcs1 \ab\af1\afs18 \ltrch\fcs0 \b\f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 NO WARRANTY +\par }{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 +Because the program is licensed free of charge, there is no warranty for the program, to the extent permitted by applicable law. Except when otherwise stated in writing the copyright holders and/or other parties provide the program "as is" without warran +\hich\af1\dbch\af13\loch\f1 t\hich\af1\dbch\af13\loch\f1 +y of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with you. Should the program p +\hich\af1\dbch\af13\loch\f1 r\hich\af1\dbch\af13\loch\f1 ove defective, you assume the cost of all necessary servicing, repair or correction. +\par \hich\af1\dbch\af13\loch\f1 In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the program as permi\hich\af1\dbch\af13\loch\f1 +tted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sus +\hich\af1\dbch\af13\loch\f1 t\hich\af1\dbch\af13\loch\f1 ained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.}{\rtlch\fcs1 +\af0 \ltrch\fcs0 \insrsid5258405 +\par }} \ No newline at end of file diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi new file mode 100644 index 0000000..207fb2f --- /dev/null +++ b/src/TortoiseGitSetup/StructureFragment.wxi @@ -0,0 +1,464 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VersionNT64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TortoiseGitSetup/StructureFragment.wxs b/src/TortoiseGitSetup/StructureFragment.wxs deleted file mode 100644 index 2c98710..0000000 --- a/src/TortoiseGitSetup/StructureFragment.wxs +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VersionNT64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TortoiseGitSetup/SubWCRev.wxs b/src/TortoiseGitSetup/SubWCRev.wxs index 1623e06..70fd7ee 100644 --- a/src/TortoiseGitSetup/SubWCRev.wxs +++ b/src/TortoiseGitSetup/SubWCRev.wxs @@ -1,5 +1,5 @@ - + @@ -25,12 +25,13 @@ + - + @@ -38,7 +39,7 @@ NOT ((VERSIONIE<<"1") OR (VERSIONIE<<"2") OR (VERSIONIE<<"3") OR (VERSIONIE<<"4")) - + @@ -61,16 +62,19 @@ - - - + This advertised application will not be installed because it might be unsafe. Contact your administrator to change the installation user interface option of the package to basic. - + @@ -81,13 +85,18 @@ - + + + + + + @@ -95,8 +104,12 @@ INSTALLDIR="" + + diff --git a/src/TortoiseGitSetup/UIFragment.wxs b/src/TortoiseGitSetup/UIFragment.wxi similarity index 98% rename from src/TortoiseGitSetup/UIFragment.wxs rename to src/TortoiseGitSetup/UIFragment.wxi index 12d5030..815bf99 100644 --- a/src/TortoiseGitSetup/UIFragment.wxs +++ b/src/TortoiseGitSetup/UIFragment.wxi @@ -1,7 +1,5 @@ - - - + $(var.PackageComments) @@ -364,9 +362,11 @@ Thanks for using TortoiseSVN. You can show your appreciation and support future development by donating! + @@ -635,10 +635,11 @@ Thanks for using TortoiseSVN. You can show your appreciation and support future development by donating! + [DlgTitleFont][Progress1] [ProductName] @@ -1107,5 +1108,4 @@ User installations are disabled via policy on the machine. An error occured during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}} - - + diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi index 3fd0c80..665602c 100644 --- a/src/TortoiseGitSetup/VersionNumberInclude.wxi +++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi @@ -1,7 +1,7 @@ - + diff --git a/src/TortoiseGitSetup/WiXSetup.wixproj b/src/TortoiseGitSetup/WiXSetup.wixproj index b5d98e9..c18d36f 100644 --- a/src/TortoiseGitSetup/WiXSetup.wixproj +++ b/src/TortoiseGitSetup/WiXSetup.wixproj @@ -1,44 +1,48 @@ - - - - - - - - - - - - - - - - - - - + + + Debug + x86 + 3.0 + {150172a5-8d02-4c00-abb5-bd99d4b16b4c} + 2.0 + WixProject1 + Package + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets + + + ..\..\bin\setup\ + obj\$(Configuration)\ + Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules; + + + + + + + ..\..\bin\setup\ + obj\$(Configuration)\ + IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules; + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TortoiseGitSetup/WixUI_Simplest.wxs b/src/TortoiseGitSetup/WixUI_Simplest.wxs index 042e29d..5009670 100644 --- a/src/TortoiseGitSetup/WixUI_Simplest.wxs +++ b/src/TortoiseGitSetup/WixUI_Simplest.wxs @@ -8,7 +8,7 @@ First-time install dialog sequence: Maintenance dialog sequence: - WixUI_VerifyReadyDlg --> - + diff --git a/src/TortoiseProc/CheckoutDlg.h b/src/TortoiseProc/CheckoutDlg.h index 9615d73..0922467 100644 --- a/src/TortoiseProc/CheckoutDlg.h +++ b/src/TortoiseProc/CheckoutDlg.h @@ -17,7 +17,8 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #pragma once -#include "SVNRev.h" +#if 0 +#include "GitRev.h" #include "StandAloneDlg.h" #include "HistoryCombo.h" #include "FileDropEdit.h" @@ -58,7 +59,7 @@ protected: DECLARE_MESSAGE_MAP() - void SetRevision(const SVNRev& rev); + void SetRevision(const GitRev& rev); protected: CToolTips m_tooltips; CString m_sRevision; @@ -68,12 +69,13 @@ protected: public: CHistoryCombo m_URLCombo; CString m_URL; - SVNRev Revision; + GitRev Revision; BOOL m_bNoExternals; CButton m_butBrowse; CEdit m_editRevision; CString m_strCheckoutDirectory; CFileDropEdit m_cCheckoutEdit; CLogDlg * m_pLogDlg; - svn_depth_t m_depth; + git_depth_t m_depth; }; +#endif \ No newline at end of file diff --git a/src/TortoiseProc/Commands/CloneCommand.cpp b/src/TortoiseProc/Commands/CloneCommand.cpp index f5101b5..a67b2e8 100644 --- a/src/TortoiseProc/Commands/CloneCommand.cpp +++ b/src/TortoiseProc/Commands/CloneCommand.cpp @@ -24,3 +24,7 @@ #include "Hooks.h" #include "MessageBox.h" +bool CloneCommand::Execute() +{ + return TRUE; +} diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj index 15e7782..f10b617 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj +++ b/src/TortoiseProc/TortoiseProc.vcproj @@ -137,7 +137,7 @@ Optimization="1" InlineFunctionExpansion="1" FavorSizeOrSpeed="2" - AdditionalIncludeDirectories=""../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph" + AdditionalIncludeDirectories=""$InputDir";../../ext/ResizableLib;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;"..\..\ext\libintl\libintl3-win32\inc";..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;"../../ext/cyrus-sasl/include";../../../common/openssl/inc32;.\RevisionGraph" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS" StringPooling="true" MinimalRebuild="false" @@ -165,7 +165,7 @@ /> - - @@ -578,11 +574,11 @@ >