# # # patch "visualc/libplatform.vcxproj" # from [6df477741d129930bb9acf5beb4f83906854d59f] # to [2d06af7ae7643e43436ec3e75a5f872eb4707885] # # patch "visualc/monotone.vcxproj" # from [b0d98ee36bb5c2f8a686f52f2064fbd7d254e843] # to [e6c108330a8ae4079f89262bbd7e559a011ba0fb] # # patch "visualc/netxx.vcxproj" # from [a0d5efdf2710681608cd36619da9f48618826987] # to [aedf0c4d5483719e1540dc2fc30a4db1533b376c] # # patch "visualc/tester.vcxproj" # from [43f9909203296b283fd92906b95f01f54dfaad11] # to [dfc56e65ba3096c843ad87087b947ef13ded9c28] # # patch "visualc/txt2c.vcxproj" # from [eb14bd92654adb25fe9348d0ad4eb34145212418] # to [0abb144f0729a2d40702232821e13dc5eb9d9804] # # patch "visualc/unit_tester.vcxproj" # from [00bd20f67a5f10c2641caa6d9f585fe6ee89e8a1] # to [36e2154b31c47106b4b0e66ae78c0a2719728cd3] # ============================================================ --- visualc/libplatform.vcxproj 6df477741d129930bb9acf5beb4f83906854d59f +++ visualc/libplatform.vcxproj 2d06af7ae7643e43436ec3e75a5f872eb4707885 @@ -21,7 +21,7 @@ MultiByte - Application + StaticLibrary false true MultiByte @@ -36,7 +36,12 @@ - + + $(SolutionDir)$(ProjectName)$(Configuration)\ + + + $(SolutionDir)$(ProjectName)$(Configuration)\ + Level3 @@ -54,6 +59,7 @@ MaxSpeed true true + $(ProjectDir);$(ProjectDir)\..;%(AdditionalIncludeDirectories) true ============================================================ --- visualc/monotone.vcxproj b0d98ee36bb5c2f8a686f52f2064fbd7d254e843 +++ visualc/monotone.vcxproj e6c108330a8ae4079f89262bbd7e559a011ba0fb @@ -38,13 +38,12 @@ <_ProjectFileVersion>10.0.30319.1 - Debug\ - monotoneDebug\ true - Release\ - monotoneRelease\ false mtn + $(SolutionDir)$(ProjectName)$(Configuration)\ + $(SolutionDir)$(ProjectName)$(Configuration)\ + mtn @@ -98,7 +97,7 @@ /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions) - botan.lib;sqlite3.lib;netxx.lib;stringprep.lib;lua.lib;pcre.lib;iconv.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;%(AdditionalDependencies) + botan.lib;sqlite3.lib;netxx.lib;libidn.lib;lua51.lib;pcre.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;libplatform.lib;%(AdditionalDependencies) $(OutDir)mtn.exe $(OutDir);%(AdditionalLibraryDirectories) true @@ -267,14 +266,17 @@ package_full_revision.cc;package_revision.cc;%(Outputs) Writing package_full_revision.cc copy "$(ProjectDir)\..\_MTN\revision" "$(ProjectDir)\..\package_revision.txt" -"$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\unknown_package.txt" package_full_revision >"$(ProjectDir)\..\package_full_revision.cc" -"$(TargetDir)\txt2c.exe" --strip-trailing --no-static "$(ProjectDir)\..\package_revision.txt" package_revision >"$(ProjectDir)\..\package_revision.cc" +"$(TargetDir)\txt2c.exe" --strip-trailing package_full_revision "$(ProjectDir)\unknown_package.txt" $(ProjectDir)\..\package_full_revision.cc" +"$(TargetDir)\txt2c.exe" --strip-trailing package_revision "$(ProjectDir)\..\package_revision.txt" $(ProjectDir)\..\package_revision.cc" $(TargetDir)\txt2c.exe;%(AdditionalInputs) package_full_revision.cc;package_revision.cc;%(Outputs) + + {309b9a4e-2572-4a68-876d-e02639f84510} + {a075e27b-893b-4426-9b52-d6a795f699de} false @@ -282,6 +284,10 @@ {efc02287-836f-470d-9955-44a8f81fb764} false + true + false + false + false ============================================================ --- visualc/netxx.vcxproj a0d5efdf2710681608cd36619da9f48618826987 +++ visualc/netxx.vcxproj aedf0c4d5483719e1540dc2fc30a4db1533b376c @@ -36,10 +36,8 @@ <_ProjectFileVersion>10.0.30319.1 - Debug\ - netxxDebug\ - Release\ - netxxRelease\ + $(SolutionDir)$(ProjectName)$(Configuration)\ + $(SolutionDir)$(ProjectName)$(Configuration)\ ============================================================ --- visualc/tester.vcxproj 43f9909203296b283fd92906b95f01f54dfaad11 +++ visualc/tester.vcxproj dfc56e65ba3096c843ad87087b947ef13ded9c28 @@ -37,12 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false + $(SolutionDir)$(ProjectName)$(Configuration)\ + $(SolutionDir)$(ProjectName)$(Configuration)\ @@ -85,7 +83,7 @@ /NODEFAULTLIB:LIBCMTD.lib %(AdditionalOptions) - botan.lib;lua.lib;pcre.lib;stringprep.lib;iconv.lib;%(AdditionalDependencies) + botan.lib;lua51.lib;pcre.lib;libidn.lib;zlib.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) true Console ============================================================ --- visualc/txt2c.vcxproj eb14bd92654adb25fe9348d0ad4eb34145212418 +++ visualc/txt2c.vcxproj 0abb144f0729a2d40702232821e13dc5eb9d9804 @@ -37,12 +37,10 @@ <_ProjectFileVersion>10.0.30319.1 - Debug\ - txt2cDebug\ true - Release\ - Release\ false + $(SolutionDir)$(ProjectName)$(Configuration)\ + $(SolutionDir)$(ProjectName)$(Configuration)\ ============================================================ --- visualc/unit_tester.vcxproj 00bd20f67a5f10c2641caa6d9f585fe6ee89e8a1 +++ visualc/unit_tester.vcxproj 36e2154b31c47106b4b0e66ae78c0a2719728cd3 @@ -18,7 +18,7 @@ Application MultiByte - false + true Application @@ -38,12 +38,10 @@ <_ProjectFileVersion>10.0.30319.1 - Debug\ - unit-testerDebug\ true - Release\ - unit-testerRelease\ false + $(SolutionDir)$(ProjectName)$(Configuration)\ + $(SolutionDir)$(ProjectName)$(Configuration)\ @@ -105,7 +103,7 @@ /NODEFAULTLIB:LIBCMT.lib %(AdditionalOptions) - botan.lib;sqlite3.lib;netxx.lib;stringprep.lib;lua.lib;pcre.lib;iconv.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;%(AdditionalDependencies) + botan.lib;netxx.lib;libidn.lib;pcre.lib;ws2_32.lib;shell32.lib;advapi32.lib;zlib.lib;libplatform.lib;%(AdditionalDependencies) $(OutDir)unit_tester.exe $(OutDir);%(AdditionalLibraryDirectories) true @@ -152,83 +150,109 @@ $(IntDir)unit_basic_io.obj + $(IntDir)unit_basic_io.obj $(IntDir)unit_charset.obj + $(IntDir)unit_charset.obj $(IntDir)unit_commands.obj + $(IntDir)unit_commands.obj $(IntDir)unit_cset.obj + $(IntDir)unit_cset.obj $(IntDir)unit_git_change.obj + $(IntDir)unit_git_change.obj $(IntDir)unit_globish.obj + $(IntDir)unit_globish.obj $(IntDir)unit_graph.obj + $(IntDir)unit_graph.obj $(IntDir)unit_merge_3way.obj + $(IntDir)unit_merge_3way.obj $(IntDir)unit_merge_roster.obj + $(IntDir)unit_merge_roster.obj $(IntDir)unit_mkstemp.obj $(IntDir)unit_netcmd.obj + $(IntDir)unit_netcmd.obj $(IntDir)unit_netxx_pipe.obj + $(IntDir)unit_netxx_pipe.obj $(IntDir)unit_option.obj + $(IntDir)unit_option.obj $(IntDir)unit_oudated_indicator.obj + $(IntDir)unit_oudated_indicator.obj $(IntDir)unit_refiner.cc + $(IntDir)unit_refiner.cc $(IntDir)unit_restrictions.obj + $(IntDir)unit_restrictions.obj $(IntDir)unit_revision.obj + $(IntDir)unit_revision.obj $(IntDir)unit_simplestring_xform.obj + $(IntDir)unit_simplestring_xform.obj $(IntDir)unit_transforms.obj + $(IntDir)unit_transforms.obj $(IntDir)unit_uri.obj + $(IntDir)unit_uri.obj $(IntDir)unit_vocab.obj + $(IntDir)unit_vocab.obj $(IntDir)unit_xdelta.obj + $(IntDir)unit_xdelta.obj + + + {309b9a4e-2572-4a68-876d-e02639f84510} + +