fixed some wingit include and lib related stuff

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 3aadcaa..0e9d1e3 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -5,6 +5,7 @@
 #include "registry.h"\r
 #include "GitConfig.h"\r
 \r
+\r
 #define MAX_DIRBUFFER 1000\r
 CString CGit::ms_LastMsysGitDir;\r
 CGit g_Git;\r

diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index 3e9af75..803176e 100644 (file)
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -132,6 +132,8 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalDependencies="wingit.lib"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/src/Git/GitStatus.h b/src/Git/GitStatus.h
index d04d80a..f5d1ffc 100644 (file)
--- a/src/Git/GitStatus.h
+++ b/src/Git/GitStatus.h
@@ -15,7 +15,7 @@ typedef std::basic_string<wchar_t> wide_string;
 #pragma warning (pop)\r
 \r
 #include "TGitPath.h"\r
-#include "wingit.h"\r
+#include "../../ext/wingit/wingit.h"\r
 \r
 typedef enum type_git_wc_status_kind\r
 {\r

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 65392cb..e6ee44c 100644 (file)
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -72,9 +72,10 @@
                                Name="VCLinkerTool"\r
                                IgnoreImportLibrary="true"\r
                                UseLibraryDependencyInputs="true"\r
-                               AdditionalDependencies="Crypt32.lib"\r
+                               AdditionalDependencies="Crypt32.lib wingit.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="libc"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"\r
@@ -156,7 +157,7 @@
                                AdditionalDependencies="Crypt32.lib wingit.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="../../ext"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index d929f1f..1def2db 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;../../ext/wingit"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
@@ -139,7 +139,7 @@
                                Optimization="1"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;../../ext/wingit"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
@@ -578,11 +578,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -818,19 +818,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -934,19 +934,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1038,11 +1038,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 6d72886..72d78e7 100644 (file)
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="0"\r
-                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI;../../ext/wingit"\r
+                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"\r
                                BasicRuntimeChecks="1"\r
                                RuntimeLibrary="3"\r
@@ -163,7 +163,7 @@
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI;../../ext/wingit"\r
+                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r