OSDN Git Service

Fail try to porting
[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / TortoiseMerge.vcproj
index 4981c77..8e87ef4 100644 (file)
@@ -47,7 +47,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\debug_win32\libsvn_diff-nonet.lib ../../ext/Subversion\debug_win32\libsvn_subr-nonet.lib ../../ext/Subversion\debug_win32\libsvn_client-nonet.lib ../../ext/apr\debug_win32\libapr_tsvn.lib ../../ext/apr-util\debug_win32\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/Subversion\debug_win32\libsvn_wc-nonet.lib ../../ext/Subversion\debug_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debug_win32\xml.lib"\r
+                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="0"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="1"\r
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\Resources\download.avi"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineadded.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineconflicted.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineconflictedignored.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineedited.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingCR.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingCRLF.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingLF.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineequal.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineremoved.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\linewhitespace.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\Toolbar.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMerge.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMerge.rc2"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\tortoisemerge_logoflipped.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMergeENG.rc"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\tortoisesvn_logoflipped.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\ttf_glyph.bmp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
                        Name="Utils"\r
                        >\r
                        <Filter\r
                        Name="libsvndiff"\r
                        >\r
                        <File\r
+                               RelativePath=".\svninclude\apr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_errno.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_file_info.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_file_io.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_general.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_getopt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_hash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_mmap.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_pools.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_sha1.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_strings.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_tables.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_time.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_want.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\libsvn_diff\diff.c"\r
                                >\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\libsvn_diff\diff_memory.c"\r
+                               RelativePath=".\libsvn_diff\lcs.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\libsvn_diff\lcs.c"\r
+                               RelativePath=".\libsvn_diff\porting.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
+                               RelativePath=".\svninclude\svn_error.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_error_codes.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_pools.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_string.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_types.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\libsvn_diff\token.c"\r
                                >\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\libsvn_diff\util.c"\r
+                               RelativePath="..\Resources\download.avi"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineadded.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineconflicted.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineconflictedignored.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineedited.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingCR.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingCRLF.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingLF.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineequal.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineremoved.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\linewhitespace.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\Toolbar.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMerge.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMerge.rc2"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\tortoisemerge_logoflipped.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMergeENG.rc"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\tortoisesvn_logoflipped.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\ttf_glyph.bmp"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="release_static|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="debug_static|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
        </Files>\r