Fix Issue 77: "Show differencess" against a deleted file will cause TortoiseMerge...

[tortoisegit/TortoiseGitJp.git] / Languages / TortoiseLang.vcproj

diff --git a/Languages/TortoiseLang.vcproj b/Languages/TortoiseLang.vcproj
index 7ed9b03..05e53c2 100644 (file)
--- a/Languages/TortoiseLang.vcproj
+++ b/Languages/TortoiseLang.vcproj
@@ -40,9 +40,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="../bin/$(ConfigurationName)/bin"\r
-                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
@@ -50,8 +50,8 @@
                                BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
                                ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
                                CleanCommandLine="nmake /f Makefile clean "\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
+                               Output="TortoiseLangs.exe"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r
                                ForcedIncludes=""\r
                                AssemblySearchPath=""\r
@@ -60,16 +60,16 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="../bin/$(ConfigurationName)/bin"\r
-                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="adfad"\r
-                               ReBuildCommandLine=""\r
-                               CleanCommandLine=""\r
+                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               CleanCommandLine="nmake /f Makefile clean "\r
                                Output="TortoiseLangs.exe"\r
                                PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r