From 50990f523025edaa57049219250076acec4ed3a1 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 28 Dec 2012 12:53:34 +0100 Subject: [PATCH] Cleanup and move all common compiler options to common.props Inspired by TortoiseSVN revision 23717. Signed-off-by: Sven Strickroth --- Languages/Makefile | 332 ++--- Languages/TortoiseLang.vcxproj | 45 +- ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj | 64 +- .../CrashHandler/CrashHandler/CrashHandler.vcxproj | 93 +- .../DumpUploaderServiceLib.vcxproj | 80 +- .../CrashHandler/SendRpt/SendRpt.vcxproj | 92 +- ext/CrashServer/CrashHandler/crashhandler.props | 55 +- ext/ResizableLib/ResizableLib.vcxproj | 154 +-- ext/build/ScintillaLexer.vcxproj | 173 +-- ext/build/libapr.vcxproj | 244 +--- ext/build/libaprutil.vcxproj | 918 +++++-------- ext/build/libcurl.vcxproj | 206 +-- ext/build/libgit.vcxproj | 170 +-- ext/build/libgit2.vcxproj | 122 +- ext/build/libgit2.vcxproj.filters | 9 - ext/build/ogdf.vcxproj | 74 +- ext/build/xml.vcxproj | 144 +-- ext/build/zlib.vcxproj | 503 +++----- ext/build/zlib.vcxproj.filters | 19 +- ext/gitdll/gitdll.vcxproj | 108 +- ext/gitdlltest/gitdlltest.vcxproj | 25 +- ext/hunspell/hunspell.vcxproj | 144 +-- src/AsyncFramework/AsyncFramework.vcxproj | 98 +- src/Git/Git.vcxproj | 73 +- src/IBugTraqProvider/IBugTraqProvider.vcxproj | 81 +- src/ResText/ResText.vcxproj | 127 +- src/SshAskPass/SshAskPass.vcxproj | 105 +- src/TGitCache/TGitCache.vcxproj | 112 +- src/TortoiseGit.common-dll.props | 14 + src/TortoiseGit.common-langs.props | 25 + src/TortoiseGit.common-staticlib.props | 12 + src/TortoiseGit.common.props | 87 ++ src/TortoiseGitBlame/TortoiseGitBlame.vcxproj | 172 +-- src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj | 299 ++--- .../CustomActions/CustomActions.vcxproj | 54 +- src/TortoiseIDiff/TortoiseIDiff.vcxproj | 93 +- src/TortoiseIDiff/TortoiseIDiffLang.vcxproj | 133 +- src/TortoiseMerge/TortoiseMerge.vcxproj | 1359 +++++++------------- src/TortoiseMerge/TortoiseMerge.vcxproj.filters | 6 - src/TortoiseMerge/TortoiseMergeLang.vcxproj | 304 ++--- .../Windows/MSVC/Plink/TortoisePlink.vcxproj | 183 +-- src/TortoiseProc/TortoiseProc.vcxproj | 144 +-- src/TortoiseProc/TortoiseProcLang.vcxproj | 169 +-- src/TortoiseProc/TortoiseProcLang.vcxproj.filters | 4 - src/TortoiseShell/TortoiseShell.vcxproj | 187 +-- src/TortoiseShell/TortoiseStub.vcxproj | 440 +++---- src/TortoiseUDiff/TortoiseUDiff.vcxproj | 99 +- src/Utils/Utils.vcxproj | 95 +- src/touch/touch.vcxproj | 105 +- 49 files changed, 2125 insertions(+), 6229 deletions(-) rewrite Languages/Makefile (97%) rewrite ext/CrashServer/CrashHandler/crashhandler.props (69%) rewrite ext/build/libaprutil.vcxproj (62%) rewrite ext/build/zlib.vcxproj (67%) create mode 100644 src/TortoiseGit.common-dll.props create mode 100644 src/TortoiseGit.common-langs.props create mode 100644 src/TortoiseGit.common-staticlib.props create mode 100644 src/TortoiseGit.common.props rewrite src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj (62%) rewrite src/TortoiseMerge/TortoiseMerge.vcxproj (71%) rewrite src/TortoiseMerge/TortoiseMergeLang.vcxproj (63%) rewrite src/TortoiseShell/TortoiseStub.vcxproj (61%) diff --git a/Languages/Makefile b/Languages/Makefile dissimilarity index 97% index 4483a6c81..dd54de384 100644 --- a/Languages/Makefile +++ b/Languages/Makefile @@ -1,166 +1,166 @@ -########################### -# -# Build Tortoise Language -# -########################### - -RESTEXT = ..\bin\$(ConfigurationName)\bin\ResText.exe -APPLY = apply -LANGDLLS = $(outdir)/TortoiseProc2052.dll \ - $(outdir)/TortoiseMerge2052.dll \ - $(outdir)/TortoiseIdiff2052.dll \ - $(outdir)/TortoiseGitBlame2052.dll \ - $(outdir)/TortoiseProc1031.dll \ - $(outdir)/TortoiseMerge1031.dll \ - $(outdir)/TortoiseIdiff1031.dll \ - $(outdir)/TortoiseGitBlame1031.dll \ - $(outdir)/TortoiseProc1036.dll \ - $(outdir)/TortoiseMerge1036.dll \ - $(outdir)/TortoiseIdiff1036.dll \ - $(outdir)/TortoiseGitBlame1036.dll \ - $(outdir)/TortoiseProc1049.dll \ - $(outdir)/TortoiseMerge1049.dll \ - $(outdir)/TortoiseIdiff1049.dll \ - $(outdir)/TortoiseGitBlame1049.dll \ - $(outdir)/TortoiseProc1028.dll \ - $(outdir)/TortoiseMerge1028.dll \ - $(outdir)/TortoiseIdiff1028.dll \ - $(outdir)/TortoiseGitBlame1028.dll \ - $(outdir)/TortoiseProc1046.dll \ - $(outdir)/TortoiseMerge1046.dll \ - $(outdir)/TortoiseIdiff1046.dll \ - $(outdir)/TortoiseGitBlame1046.dll \ - $(outdir)/TortoiseProc1034.dll \ - $(outdir)/TortoiseMerge1034.dll \ - $(outdir)/TortoiseIdiff1034.dll \ - $(outdir)/TortoiseGitBlame1034.dll \ - $(outdir)/TortoiseProc1041.dll \ - $(outdir)/TortoiseMerge1041.dll \ - $(outdir)/TortoiseIdiff1041.dll \ - $(outdir)/TortoiseGitBlame1041.dll \ - $(outdir)/TortoiseProc1055.dll \ - $(outdir)/TortoiseMerge1055.dll \ - $(outdir)/TortoiseIdiff1055.dll \ - $(outdir)/TortoiseGitBlame1055.dll \ - $(outdir)/TortoiseProc1029.dll \ - $(outdir)/TortoiseMerge1029.dll \ - $(outdir)/TortoiseIdiff1029.dll \ - $(outdir)/TortoiseGitBlame1029.dll \ - $(outdir)/TortoiseProc1045.dll \ - $(outdir)/TortoiseMerge1045.dll \ - $(outdir)/TortoiseIdiff1045.dll \ - $(outdir)/TortoiseGitBlame1045.dll \ - $(outdir)/TortoiseProc1053.dll \ - $(outdir)/TortoiseMerge1053.dll \ - $(outdir)/TortoiseIdiff1053.dll \ - $(outdir)/TortoiseGitBlame1053.dll \ - -all:$(LANGDLLS) - -$(outdir)/TortoiseProc2052.dll:Tortoise_zh_CN.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_zh_CN.po -$(outdir)/TortoiseMerge2052.dll:Tortoise_zh_CN.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_zh_CN.po -$(outdir)/TortoiseIdiff2052.dll:Tortoise_zh_CN.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_zh_CN.po -$(outdir)/TortoiseGitBlame2052.dll:Tortoise_zh_CN.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_zh_CN.po - -$(outdir)/TortoiseProc1031.dll:Tortoise_de.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_de.po -$(outdir)/TortoiseMerge1031.dll:Tortoise_de.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_de.po -$(outdir)/TortoiseIdiff1031.dll:Tortoise_de.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_de.po -$(outdir)/TortoiseGitBlame1031.dll:Tortoise_de.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_de.po - -$(outdir)/TortoiseProc1036.dll:Tortoise_fr.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_fr.po -$(outdir)/TortoiseMerge1036.dll:Tortoise_fr.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_fr.po -$(outdir)/TortoiseIdiff1036.dll:Tortoise_fr.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_fr.po -$(outdir)/TortoiseGitBlame1036.dll:Tortoise_fr.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_fr.po - -$(outdir)/TortoiseProc1049.dll:Tortoise_ru.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_ru.po -$(outdir)/TortoiseMerge1049.dll:Tortoise_ru.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_ru.po -$(outdir)/TortoiseIdiff1049.dll:Tortoise_ru.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_ru.po -$(outdir)/TortoiseGitBlame1049.dll:Tortoise_ru.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_ru.po - -$(outdir)/TortoiseProc1028.dll:Tortoise_zh_TW.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_zh_TW.po -$(outdir)/TortoiseMerge1028.dll:Tortoise_zh_TW.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_zh_TW.po -$(outdir)/TortoiseIdiff1028.dll:Tortoise_zh_TW.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_zh_TW.po -$(outdir)/TortoiseGitBlame1028.dll:Tortoise_zh_TW.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_zh_TW.po - -$(outdir)/TortoiseProc1046.dll:Tortoise_pt_BR.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_pt_BR.po -$(outdir)/TortoiseMerge1046.dll:Tortoise_pt_BR.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_pt_BR.po -$(outdir)/TortoiseIdiff1046.dll:Tortoise_pt_BR.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_pt_BR.po -$(outdir)/TortoiseGitBlame1046.dll:Tortoise_pt_BR.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_pt_BR.po - -$(outdir)/TortoiseProc1034.dll:Tortoise_es_ES.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_es_ES.po -$(outdir)/TortoiseMerge1034.dll:Tortoise_es_ES.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_es_ES.po -$(outdir)/TortoiseIdiff1034.dll:Tortoise_es_ES.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_es_ES.po -$(outdir)/TortoiseGitBlame1034.dll:Tortoise_es_ES.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_es_ES.po - -$(outdir)/TortoiseProc1041.dll:Tortoise_ja.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_ja.po -$(outdir)/TortoiseMerge1041.dll:Tortoise_ja.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_ja.po -$(outdir)/TortoiseIdiff1041.dll:Tortoise_ja.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_ja.po -$(outdir)/TortoiseGitBlame1041.dll:Tortoise_ja.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_ja.po - -$(outdir)/TortoiseProc1055.dll:Tortoise_tr.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_tr.po -$(outdir)/TortoiseMerge1055.dll:Tortoise_tr.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_tr.po -$(outdir)/TortoiseIdiff1055.dll:Tortoise_tr.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_tr.po -$(outdir)/TortoiseGitBlame1055.dll:Tortoise_tr.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_tr.po - -$(outdir)/TortoiseProc1029.dll:Tortoise_cs.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_cs.po -$(outdir)/TortoiseMerge1029.dll:Tortoise_cs.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_cs.po -$(outdir)/TortoiseIdiff1029.dll:Tortoise_cs.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_cs.po -$(outdir)/TortoiseGitBlame1029.dll:Tortoise_cs.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_cs.po - -$(outdir)/TortoiseProc1045.dll:Tortoise_pl_PL.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_pl_PL.po -$(outdir)/TortoiseMerge1045.dll:Tortoise_pl_PL.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_pl_PL.po -$(outdir)/TortoiseIdiff1045.dll:Tortoise_pl_PL.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_pl_PL.po -$(outdir)/TortoiseGitBlame1045.dll:Tortoise_pl_PL.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_pl_PL.po - -$(outdir)/TortoiseProc1053.dll:Tortoise_sv.po $(outdir)\TortoiseProcLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseProcLang.dll $@ Tortoise_sv.po -$(outdir)/TortoiseMerge1053.dll:Tortoise_sv.po $(outdir)\TortoiseMergeLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseMergeLang.dll $@ Tortoise_sv.po -$(outdir)/TortoiseIdiff1053.dll:Tortoise_sv.po $(outdir)\TortoiseIdiffLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseIdiffLang.dll $@ Tortoise_sv.po -$(outdir)/TortoiseGitBlame1053.dll:Tortoise_sv.po $(outdir)\TortoiseGitBlameLang.dll - $(RESTEXT) $(APPLY) $(outdir)\TortoiseGitBlameLang.dll $@ Tortoise_sv.po +########################### +# +# Build Tortoise Language +# +########################### + +RESTEXT = $(outdir)ResText.exe +APPLY = apply +LANGDLLS = $(outdir)TortoiseProc2052.dll \ + $(outdir)TortoiseMerge2052.dll \ + $(outdir)TortoiseIdiff2052.dll \ + $(outdir)TortoiseGitBlame2052.dll \ + $(outdir)TortoiseProc1031.dll \ + $(outdir)TortoiseMerge1031.dll \ + $(outdir)TortoiseIdiff1031.dll \ + $(outdir)TortoiseGitBlame1031.dll \ + $(outdir)TortoiseProc1036.dll \ + $(outdir)TortoiseMerge1036.dll \ + $(outdir)TortoiseIdiff1036.dll \ + $(outdir)TortoiseGitBlame1036.dll \ + $(outdir)TortoiseProc1049.dll \ + $(outdir)TortoiseMerge1049.dll \ + $(outdir)TortoiseIdiff1049.dll \ + $(outdir)TortoiseGitBlame1049.dll \ + $(outdir)TortoiseProc1028.dll \ + $(outdir)TortoiseMerge1028.dll \ + $(outdir)TortoiseIdiff1028.dll \ + $(outdir)TortoiseGitBlame1028.dll \ + $(outdir)TortoiseProc1046.dll \ + $(outdir)TortoiseMerge1046.dll \ + $(outdir)TortoiseIdiff1046.dll \ + $(outdir)TortoiseGitBlame1046.dll \ + $(outdir)TortoiseProc1034.dll \ + $(outdir)TortoiseMerge1034.dll \ + $(outdir)TortoiseIdiff1034.dll \ + $(outdir)TortoiseGitBlame1034.dll \ + $(outdir)TortoiseProc1041.dll \ + $(outdir)TortoiseMerge1041.dll \ + $(outdir)TortoiseIdiff1041.dll \ + $(outdir)TortoiseGitBlame1041.dll \ + $(outdir)TortoiseProc1055.dll \ + $(outdir)TortoiseMerge1055.dll \ + $(outdir)TortoiseIdiff1055.dll \ + $(outdir)TortoiseGitBlame1055.dll \ + $(outdir)TortoiseProc1029.dll \ + $(outdir)TortoiseMerge1029.dll \ + $(outdir)TortoiseIdiff1029.dll \ + $(outdir)TortoiseGitBlame1029.dll \ + $(outdir)TortoiseProc1045.dll \ + $(outdir)TortoiseMerge1045.dll \ + $(outdir)TortoiseIdiff1045.dll \ + $(outdir)TortoiseGitBlame1045.dll \ + $(outdir)TortoiseProc1053.dll \ + $(outdir)TortoiseMerge1053.dll \ + $(outdir)TortoiseIdiff1053.dll \ + $(outdir)TortoiseGitBlame1053.dll \ + +all:$(LANGDLLS) + +$(outdir)TortoiseProc2052.dll:Tortoise_zh_CN.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_zh_CN.po +$(outdir)TortoiseMerge2052.dll:Tortoise_zh_CN.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_zh_CN.po +$(outdir)TortoiseIdiff2052.dll:Tortoise_zh_CN.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_zh_CN.po +$(outdir)TortoiseGitBlame2052.dll:Tortoise_zh_CN.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_zh_CN.po + +$(outdir)TortoiseProc1031.dll:Tortoise_de.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_de.po +$(outdir)TortoiseMerge1031.dll:Tortoise_de.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_de.po +$(outdir)TortoiseIdiff1031.dll:Tortoise_de.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_de.po +$(outdir)TortoiseGitBlame1031.dll:Tortoise_de.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_de.po + +$(outdir)TortoiseProc1036.dll:Tortoise_fr.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_fr.po +$(outdir)TortoiseMerge1036.dll:Tortoise_fr.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_fr.po +$(outdir)TortoiseIdiff1036.dll:Tortoise_fr.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_fr.po +$(outdir)TortoiseGitBlame1036.dll:Tortoise_fr.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_fr.po + +$(outdir)TortoiseProc1049.dll:Tortoise_ru.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_ru.po +$(outdir)TortoiseMerge1049.dll:Tortoise_ru.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_ru.po +$(outdir)TortoiseIdiff1049.dll:Tortoise_ru.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_ru.po +$(outdir)TortoiseGitBlame1049.dll:Tortoise_ru.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_ru.po + +$(outdir)TortoiseProc1028.dll:Tortoise_zh_TW.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_zh_TW.po +$(outdir)TortoiseMerge1028.dll:Tortoise_zh_TW.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_zh_TW.po +$(outdir)TortoiseIdiff1028.dll:Tortoise_zh_TW.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_zh_TW.po +$(outdir)TortoiseGitBlame1028.dll:Tortoise_zh_TW.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_zh_TW.po + +$(outdir)TortoiseProc1046.dll:Tortoise_pt_BR.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_pt_BR.po +$(outdir)TortoiseMerge1046.dll:Tortoise_pt_BR.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_pt_BR.po +$(outdir)TortoiseIdiff1046.dll:Tortoise_pt_BR.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_pt_BR.po +$(outdir)TortoiseGitBlame1046.dll:Tortoise_pt_BR.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_pt_BR.po + +$(outdir)TortoiseProc1034.dll:Tortoise_es_ES.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_es_ES.po +$(outdir)TortoiseMerge1034.dll:Tortoise_es_ES.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_es_ES.po +$(outdir)TortoiseIdiff1034.dll:Tortoise_es_ES.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_es_ES.po +$(outdir)TortoiseGitBlame1034.dll:Tortoise_es_ES.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_es_ES.po + +$(outdir)TortoiseProc1041.dll:Tortoise_ja.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_ja.po +$(outdir)TortoiseMerge1041.dll:Tortoise_ja.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_ja.po +$(outdir)TortoiseIdiff1041.dll:Tortoise_ja.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_ja.po +$(outdir)TortoiseGitBlame1041.dll:Tortoise_ja.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_ja.po + +$(outdir)TortoiseProc1055.dll:Tortoise_tr.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_tr.po +$(outdir)TortoiseMerge1055.dll:Tortoise_tr.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_tr.po +$(outdir)TortoiseIdiff1055.dll:Tortoise_tr.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_tr.po +$(outdir)TortoiseGitBlame1055.dll:Tortoise_tr.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_tr.po + +$(outdir)TortoiseProc1029.dll:Tortoise_cs.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_cs.po +$(outdir)TortoiseMerge1029.dll:Tortoise_cs.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_cs.po +$(outdir)TortoiseIdiff1029.dll:Tortoise_cs.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_cs.po +$(outdir)TortoiseGitBlame1029.dll:Tortoise_cs.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_cs.po + +$(outdir)TortoiseProc1045.dll:Tortoise_pl_PL.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_pl_PL.po +$(outdir)TortoiseMerge1045.dll:Tortoise_pl_PL.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_pl_PL.po +$(outdir)TortoiseIdiff1045.dll:Tortoise_pl_PL.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_pl_PL.po +$(outdir)TortoiseGitBlame1045.dll:Tortoise_pl_PL.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_pl_PL.po + +$(outdir)TortoiseProc1053.dll:Tortoise_sv.po $(outdir)TortoiseProcLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseProcLang.dll $@ Tortoise_sv.po +$(outdir)TortoiseMerge1053.dll:Tortoise_sv.po $(outdir)TortoiseMergeLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseMergeLang.dll $@ Tortoise_sv.po +$(outdir)TortoiseIdiff1053.dll:Tortoise_sv.po $(outdir)TortoiseIdiffLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseIdiffLang.dll $@ Tortoise_sv.po +$(outdir)TortoiseGitBlame1053.dll:Tortoise_sv.po $(outdir)TortoiseGitBlameLang.dll + $(RESTEXT) $(APPLY) $(outdir)TortoiseGitBlameLang.dll $@ Tortoise_sv.po diff --git a/Languages/TortoiseLang.vcxproj b/Languages/TortoiseLang.vcxproj index eb0a36ecf..9f8d08878 100644 --- a/Languages/TortoiseLang.vcxproj +++ b/Languages/TortoiseLang.vcxproj @@ -46,55 +46,28 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 + <_ProjectFileVersion>10.0.30319.1 - - ../bin/$(Configuration)/bin\ - ../obj/lang/$(Configuration)/\ - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration) - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration) - nmake /f Makefile clean - - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - - - ../bin/$(Configuration)64/bin\ - ../obj/lang/$(Configuration)64/\ - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration)64 - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration)64 - nmake /f Makefile clean - TortoiseLangs.exe - WIN32;NDEBUG;$(NMakePreprocessorDefinitions) - - - ../bin/$(Configuration)/bin\ - ../obj/lang/$(Configuration)/\ - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration) - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration) - nmake /f Makefile clean - TortoiseLangs.exe - WIN32;NDEBUG;$(NMakePreprocessorDefinitions) - - - ../bin/$(Configuration)64/bin\ - ../obj/lang/$(Configuration)64/\ - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration)64 - nmake /f Makefile outdir=$(OutDir) ConfigurationName=$(Configuration)64 - nmake /f Makefile clean - TortoiseLangs.exe - WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + + nmake /f Makefile outdir=$(OutDir) + nmake /f Makefile outdir=$(OutDir) + nmake /f Makefile clean diff --git a/ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj b/ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj index 43a7a033a..e676b5db7 100644 --- a/ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj +++ b/ext/CrashServer/CommonLibs/Zlib/Zlib.vcxproj @@ -53,90 +53,58 @@ + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)64\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\CrashServer_Zlib_static\$(Configuration)64\ - - Disabled $(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - EditAndContinue + NotUsing - MinSpace - true - true $(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + NotUsing - - X64 - - Disabled $(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase + NotUsing - - X64 - - MinSpace - true - true $(ProjectDir)..\..\external\zlib123;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + NotUsing diff --git a/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcxproj b/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcxproj index 43763fac0..5b4eef88f 100644 --- a/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcxproj +++ b/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcxproj @@ -33,7 +33,7 @@ DynamicLibrary v110_xp - Dynamic + Static Unicode true @@ -47,7 +47,7 @@ DynamicLibrary v110_xp - Dynamic + Static Unicode true @@ -56,136 +56,90 @@ + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\CrashHandler\$(Configuration)\ crshhndl - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\CrashHandler\$(Configuration)\ crshhndl - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\CrashHandler\$(Configuration)64\ crshhndl - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\CrashHandler\$(Configuration)64\ crshhndl - Disabled - ..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - ProgramDatabase + ..\$(GsoapDir);..\$(ZlibDir);..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - $(OutDir)crshhndl.dll CrashHandler.def - true Console - MachineX86 - MinSpace - true - true - ..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) - MultiThreaded - true - - Level3 - ProgramDatabase + ..\$(GsoapDir);..\$(ZlibDir);..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - $(OutDir)crshhndl.dll CrashHandler.def - true Console - true - true - MachineX86 - - X64 - - Disabled - ..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) - true - EnableFastChecks - MultiThreadedDebug - - Level3 - ProgramDatabase + ..\$(GsoapDir);..\$(ZlibDir);..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - $(OutDir)crshhndl.dll CrashHandler.def - true Console - MachineX64 - - X64 - - MinSpace - true - true - ..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) - MultiThreaded - true - - Level3 - ProgramDatabase + ..\$(GsoapDir);..\$(ZlibDir);..\wtl\include;..\;..\..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - $(OutDir)crshhndl.dll CrashHandler.def - true Console - true - true - MachineX64 - + + Create + @@ -201,10 +155,7 @@ - $(OutDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalIncludeDirectories) - $(OutDir);%(AdditionalIncludeDirectories) + $(OutDir);%(AdditionalIncludeDirectories) diff --git a/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcxproj b/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcxproj index 304665b36..58e86fc5c 100644 --- a/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcxproj +++ b/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcxproj @@ -52,90 +52,58 @@ + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\DumpUploadServiceLib\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\DumpUploadServiceLib\$(Configuration)64\ - - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\DumpUploadServiceLib\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\DumpUploadServiceLib\$(Configuration)64\ - - Disabled - ..\..\external\gsoap-win32-2.8.0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;SOAP_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - EditAndContinue + ..\..\external\$(GsoapDir);%(AdditionalIncludeDirectories) + SOAP_DEBUG;%(PreprocessorDefinitions) + NotUsing - - X64 - - Disabled - ..\..\external\gsoap-win32-2.8.0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;SOAP_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);%(AdditionalIncludeDirectories) + WIN32;SOAP_DEBUG;%(PreprocessorDefinitions) + NotUsing - MinSpace - true - true - ..\..\external\gsoap-win32-2.8.0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;SOAP_NDEBUG;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);%(AdditionalIncludeDirectories) + SOAP_NDEBUG;%(PreprocessorDefinitions) + NotUsing - - X64 - - MinSpace - true - true - ..\..\external\gsoap-win32-2.8.0;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;SOAP_NDEBUG;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);%(AdditionalIncludeDirectories) + WIN32;SOAP_NDEBUG;%(PreprocessorDefinitions) + NotUsing diff --git a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj index f3359dc38..feb7282b8 100644 --- a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj +++ b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcxproj @@ -52,114 +52,62 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\SendRpt\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\SendRpt\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\SendRpt\$(Configuration)64\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\SendRpt\$(Configuration)64\ - - Disabled - ..\..\external\gsoap-win32-2.8.0;..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - true - MachineX86 - MinSpace - true - true - ..\..\external\gsoap-win32-2.8.0;..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) version.lib;%(AdditionalDependencies) - true - true - true - MachineX86 + false - - X64 - - Disabled - ..\..\external\gsoap-win32-2.8.0;..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) - USE64;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) + USE64;%(PreprocessorDefinitions) version.lib;%(AdditionalDependencies) - true - MachineX64 - - X64 - - MinSpace - true - true - ..\..\external\gsoap-win32-2.8.0;..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) - USE64;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - true - Level3 - ProgramDatabase + ..\..\external\$(GsoapDir);..\..\external\wtl\include;..\;%(AdditionalIncludeDirectories) + USE64;%(PreprocessorDefinitions) version.lib;%(AdditionalDependencies) - true - true - true - MachineX64 + false @@ -177,11 +125,15 @@ - + + NotUsing + - + + Create + diff --git a/ext/CrashServer/CrashHandler/crashhandler.props b/ext/CrashServer/CrashHandler/crashhandler.props dissimilarity index 69% index 345903a3b..756a5c609 100644 --- a/ext/CrashServer/CrashHandler/crashhandler.props +++ b/ext/CrashServer/CrashHandler/crashhandler.props @@ -1,27 +1,28 @@ - - - - - $(SolutionDir)..\external\ - $(ExternalDir)gsoap-win32-2.8.0 - - - $(SolutionDir)out\$(Platform)\$(Configuration)\ - - - $(SolutionDir)out\$(Platform)\$(Configuration)\temp\$(ProjectName)\ - - - - $(SolutionDir)..\;$(SolutionDir);%(AdditionalIncludeDirectories) - - - - - $(ExternalDir) - - - $(GsoapDir) - - - \ No newline at end of file + + + + + zlib123 + gsoap-win32-2.8.0 + + + <_ProjectFileVersion>10.0.30319.1 + + + + MinSpace + MultiThreaded + true + + + + + MultiThreadedDebug + + + + + Level3 + + + diff --git a/ext/ResizableLib/ResizableLib.vcxproj b/ext/ResizableLib/ResizableLib.vcxproj index b416a3fc0..b7af5e0b0 100644 --- a/ext/ResizableLib/ResizableLib.vcxproj +++ b/ext/ResizableLib/ResizableLib.vcxproj @@ -55,156 +55,28 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\ResizeableLib\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\ResizeableLib\$(Configuration)64\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\ResizeableLib\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\ResizeableLib\$(Configuration)64\ - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc70.pdb - Level4 - true - 4018;%(DisableSpecificWarnings) - - - _AFXDLL;NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - $(OutDir)$(ProjectName).lib - true - - - - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc70.pdb - Level4 - true - - - _AFXDLL;NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - $(OutDir)$(ProjectName).lib - true - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Default - MultiThreadedDebugDLL - false - true - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc70.pdb - Level4 - true - EditAndContinue - 4018;%(DisableSpecificWarnings) - - - _AFXDLL;_DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - $(OutDir)$(ProjectName).lib - true - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Default - MultiThreadedDebugDLL - false - true - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc70.pdb - Level4 - true - ProgramDatabase - - - _AFXDLL;_DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - $(OutDir)$(ProjectName).lib - true - - @@ -227,10 +99,7 @@ - Create - Create - Create - Create + Create @@ -266,9 +135,4 @@ - - - - - \ No newline at end of file diff --git a/ext/build/ScintillaLexer.vcxproj b/ext/build/ScintillaLexer.vcxproj index 279a79da9..c5e748cd7 100644 --- a/ext/build/ScintillaLexer.vcxproj +++ b/ext/build/ScintillaLexer.vcxproj @@ -27,27 +27,23 @@ DynamicLibrary v110_xp - false Unicode true DynamicLibrary v110_xp - false Unicode DynamicLibrary v110_xp - false Unicode true DynamicLibrary v110_xp - false Unicode @@ -55,206 +51,69 @@ - + + - + + - + + - + + <_ProjectFileVersion>11.0.51106.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\SciLexer\$(Configuration)\ - true - - - ..\..\bin\debug64\bin\ - ..\..\obj\SciLexer\debug64\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\SciLexer\$(Configuration)\ - false - - - ..\..\bin\release64\bin\ - ..\..\obj\SciLexer\release64\ - false - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\bin\SciLexer.tlb - - - Disabled ..\scintilla\include;..\scintilla\src;..\scintilla\lexlib;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)Scileyer.pch - true - Level4 - true - EditAndContinue + SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4996;4018;%(DisableSpecificWarnings) + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - imm32.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - true - - MachineX86 - - true - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\..\bin\SciLexer.tlb - - - Disabled ..\scintilla\include;..\scintilla\src;..\scintilla\lexlib;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)Scileyer.pch - true - Level4 - true - ProgramDatabase + SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - imm32.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - true - false - - MachineX64 - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\bin\SciLexer.tlb - - - true - true ..\scintilla\include;..\scintilla\src;..\scintilla\lexlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)Scileyer.pch - Level4 - true + SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4996;4018;%(DisableSpecificWarnings) + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - imm32.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - true - true - $(IntDir)scilexer.map - true - true - UseLinkTimeCodeGeneration - true - MachineX86 - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\..\bin\SciLexer.tlb - - - true - true ..\scintilla\include;..\scintilla\src;..\scintilla\lexlib;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)Scileyer.pch - Level4 - true + SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - imm32.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - true - true - $(IntDir)scilexer.map - true - true - UseLinkTimeCodeGeneration - true - MachineX64 - - true - diff --git a/ext/build/libapr.vcxproj b/ext/build/libapr.vcxproj index c924733cd..b4ff0b42b 100644 --- a/ext/build/libapr.vcxproj +++ b/ext/build/libapr.vcxproj @@ -26,23 +26,19 @@ DynamicLibrary v110_xp - false DynamicLibrary v110_xp - false true DynamicLibrary v110_xp - false DynamicLibrary v110_xp - false true @@ -50,253 +46,118 @@ - + + - + + - + + - + + <_ProjectFileVersion>11.0.51106.1 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libapr\$(Configuration)\ - false - libapr_tsvn32 + $(ProjectName)_tsvn32 - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libapr\$(Configuration)64\ - false - libapr_tsvn + $(ProjectName)_tsvn - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libapr\$(Configuration)\ - false - libapr_tsvn32 + $(ProjectName)_tsvn32 - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libapr\$(Configuration)64\ - false - libapr_tsvn + $(ProjectName)_tsvn - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/libapr.tlb - - - MaxSpeed - true - true ..\apr\include;..\apr\include\arch;..\apr\include\arch\win32;..\apr\include\arch\unix;%(AdditionalIncludeDirectories) - NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\libapr.pch - .\Release/ - $(IntDir) - $(IntDir)libapr_src - Level3 - true - ProgramDatabase + APR_DECLARE_EXPORT;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 + APR_VERSION_ONLY;%(PreprocessorDefinitions) ..\apr\include;%(AdditionalIncludeDirectories) - /MACHINE:X86 %(AdditionalOptions) ws2_32.lib;mswsock.lib;rpcrt4.lib;%(AdditionalDependencies) - $(OutDir)libapr_tsvn32.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - true - true - UseLinkTimeCodeGeneration - true 0x6EEC0000 - $(OutDir)libapr_tsvn.lib - - true - .\Release\libapr.bsc - Embed .manifest if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release\libapr.tlb - - - MaxSpeed - true - true ..\apr\include;..\apr\include\arch;..\apr\include\arch\win32;..\apr\include\arch\unix;%(AdditionalIncludeDirectories) - NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;WIN64;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release64\libapr.pch - .\Release\ - $(IntDir) - $(IntDir)libapr_src - Level3 - true - ProgramDatabase + WIN32;APR_DECLARE_EXPORT;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 + APR_VERSION_ONLY;%(PreprocessorDefinitions) ..\apr\include;%(AdditionalIncludeDirectories) ws2_32.lib;mswsock.lib;rpcrt4.lib;%(AdditionalDependencies) - $(OutDir)libapr_tsvn.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - true - true - UseLinkTimeCodeGeneration - true 0x6EEC0000 - $(OutDir)libapr_tsvn.lib - MachineX64 - - true - .\Release\libapr.bsc - + Embed .manifest if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\libapr.tlb - - - /EHsc %(AdditionalOptions) - Disabled ..\apr\include;..\apr\include\arch;..\apr\include\arch\win32;..\apr\include\arch\unix;%(AdditionalIncludeDirectories) - _DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug\libapr.pch - .\Debug\ - $(IntDir) - $(IntDir)libapr_src - Level3 - true - ProgramDatabase + APR_DECLARE_EXPORT;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 + APR_VERSION_ONLY;%(PreprocessorDefinitions) ..\apr\include;%(AdditionalIncludeDirectories) - /MACHINE:X86 %(AdditionalOptions) ws2_32.lib;mswsock.lib;rpcrt4.lib;%(AdditionalDependencies) - $(OutDir)libapr_tsvn32.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows 0x6EEC0000 - false - - $(OutDir)libapr_tsvn.lib - - true - .\Debug\libapr.bsc - + Embed .manifest if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug\libapr.tlb - - - /EHsc %(AdditionalOptions) - Disabled ..\apr\include;..\apr\include\arch;..\apr\include\arch\win32;..\apr\include\arch\unix;%(AdditionalIncludeDirectories) - _DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;WIN64;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug\libapr.pch - .\Debug\ - $(IntDir) - $(IntDir)libapr_src - Level3 - true - ProgramDatabase + WIN32;APR_DECLARE_EXPORT;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 + APR_VERSION_ONLY;%(PreprocessorDefinitions) ..\apr\include;%(AdditionalIncludeDirectories) ws2_32.lib;mswsock.lib;rpcrt4.lib;%(AdditionalDependencies) - $(OutDir)libapr_tsvn.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows 0x6EEC0000 - false - - $(OutDir)libapr_tsvn.lib - MachineX64 - - true - .\Debug\libapr.bsc - + Embed .manifest if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 @@ -328,10 +189,7 @@ - true - true - true - true + true @@ -431,47 +289,21 @@ - true - true - true - true + true - true - true - true - true + true - Creating apr.h from apr.hw - fc ..\apr\include\apr.hw ..\apr\include\apr.h >NUL 2>NUL + Creating apr.h from apr.hw + fc ..\apr\include\apr.hw ..\apr\include\apr.h >NUL 2>NUL if errorlevel 1 type ..\apr\include\apr.hw > ..\apr\include\apr.h - ..\apr\include\apr.h;%(Outputs) - Creating apr.h from apr.hw - fc ..\apr\include\apr.hw ..\apr\include\apr.h >NUL 2>NUL -if errorlevel 1 type ..\apr\include\apr.hw > ..\apr\include\apr.h - - ..\apr\include\apr.h;%(Outputs) - Creating apr.h from apr.hw - fc ..\apr\include\apr.hw ..\apr\include\apr.h >NUL 2>NUL -if errorlevel 1 type ..\apr\include\apr.hw > ..\apr\include\apr.h - - ..\apr\include\apr.h;%(Outputs) - Creating apr.h from apr.hw - fc ..\apr\include\apr.hw ..\apr\include\apr.h >NUL 2>NUL -if errorlevel 1 type ..\apr\include\apr.hw > ..\apr\include\apr.h - - ..\apr\include\apr.h;%(Outputs) + ..\apr\include\apr.h;%(Outputs) - - \TortoiseGit\ext\apr;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr;%(AdditionalIncludeDirectories) - + diff --git a/ext/build/libaprutil.vcxproj b/ext/build/libaprutil.vcxproj dissimilarity index 62% index d86e952c2..277c88d05 100644 --- a/ext/build/libaprutil.vcxproj +++ b/ext/build/libaprutil.vcxproj @@ -1,579 +1,339 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9} - libaprutil - - - - DynamicLibrary - v110_xp - false - true - - - DynamicLibrary - v110_xp - false - - - DynamicLibrary - v110_xp - false - true - - - DynamicLibrary - v110_xp - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libaprutil\$(Configuration)\ - false - libaprutil_tsvn32 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libaprutil\$(Configuration)\ - false - libaprutil_tsvn32 - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libaprutil\$(Configuration)64\ - false - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libaprutil\$(Configuration)64\ - false - - - - fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL -if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\libaprutil.tlb - - - - /EHsc %(AdditionalOptions) - Disabled - ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-iconv\include;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) - _DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug\libaprutil.pch - .\Debug\ - $(IntDir) - $(IntDir)libaprutil_src - Level3 - true - ProgramDatabase - - - _DEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 - ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) - - - /MACHINE:X86 %(AdditionalOptions) - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - $(OutDir)libaprutil_tsvn32.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - 0x6EE60000 - false - - $(OutDir)libaprutil_tsvn.lib - - - true - .\Debug\libaprutil.bsc - - - Embed .manifest - if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - - - - fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL -if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release\libaprutil.tlb - - - - MaxSpeed - true - true - ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-iconv\include;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) - NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\libaprutil.pch - .\Release\ - $(IntDir) - $(IntDir)libaprutil_src - Level3 - true - ProgramDatabase - - - NDEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 - ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) - - - /MACHINE:X86 %(AdditionalOptions) - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - $(OutDir)libaprutil_tsvn32.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - true - true - UseLinkTimeCodeGeneration - true - 0x6EE60000 - $(OutDir)libaprutil_tsvn.lib - - - true - .\Release\libaprutil.bsc - - - Embed .manifest - if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - - - - fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL -if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug\libaprutil.tlb - - - - /EHsc %(AdditionalOptions) - Disabled - ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-iconv\include;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) - _DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug\libaprutil.pch - .\Debug\ - $(IntDir) - $(IntDir)libaprutil_src - Level3 - true - ProgramDatabase - - - _DEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 - ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) - - - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - $(OutDir)libaprutil_tsvn.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - 0x6EE60000 - false - - $(OutDir)libaprutil_tsvn.lib - MachineX64 - - - true - .\Debug\libaprutil.bsc - - - Embed .manifest - if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - - - - fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL -if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/libaprutil.tlb - - - - MaxSpeed - true - true - ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-iconv\include;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) - NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\libaprutil.pch - .\Release\ - $(IntDir) - $(IntDir)libaprutil_src - Level3 - true - ProgramDatabase - - - NDEBUG;APU_VERSION_ONLY;%(PreprocessorDefinitions) - 0x0409 - ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) - - - ws2_32.lib;mswsock.lib;%(AdditionalDependencies) - $(OutDir)libaprutil_tsvn.dll - true - true - $(OutDir)libapr_tsvn.pdb - Windows - true - true - UseLinkTimeCodeGeneration - true - 0x6EE60000 - $(OutDir)libaprutil_tsvn.lib - MachineX64 - - - true - .\Release\libaprutil.bsc - - - Embed .manifest - if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating apr_ldap.h from apr_ldap.hw - fc ..\apr-util\include\apr_ldap.hw ..\apr-util\include\apr_ldap.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apr_ldap.hw > ..\apr-util\include\apr_ldap.h - - ..\apr-util\include\apr_ldap.h;%(Outputs) - Creating apr_ldap.h from apr_ldap.hw - fc ..\apr-util\include\apr_ldap.hw ..\apr-util\include\apr_ldap.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apr_ldap.hw > ..\apr-util\include\apr_ldap.h - - ..\apr-util\include\apr_ldap.h;%(Outputs) - Creating apr_ldap.h from apr_ldap.hw - fc ..\apr-util\include\apr_ldap.hw ..\apr-util\include\apr_ldap.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apr_ldap.hw > ..\apr-util\include\apr_ldap.h - - ..\apr-util\include\apr_ldap.h;%(Outputs) - Creating apr_ldap.h from apr_ldap.hw - fc ..\apr-util\include\apr_ldap.hw ..\apr-util\include\apr_ldap.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apr_ldap.hw > ..\apr-util\include\apr_ldap.h - - ..\apr-util\include\apr_ldap.h;%(Outputs) - - - - - Creating apu.h from apu.hw - fc ..\apr-util\include\apu.hw ..\apr-util\include\apu.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu.hw > ..\apr-util\include\apu.h - - ..\apr-util\include\apu.h;%(Outputs) - Creating apu.h from apu.hw - fc ..\apr-util\include\apu.hw ..\apr-util\include\apu.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu.hw > ..\apr-util\include\apu.h - - ..\apr-util\include\apu.h;%(Outputs) - Creating apu.h from apu.hw - fc ..\apr-util\include\apu.hw ..\apr-util\include\apu.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu.hw > ..\apr-util\include\apu.h - - ..\apr-util\include\apu.h;%(Outputs) - Creating apu.h from apu.hw - fc ..\apr-util\include\apu.hw ..\apr-util\include\apu.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu.hw > ..\apr-util\include\apu.h - - ..\apr-util\include\apu.h;%(Outputs) - - - - Creating apu_config.h from apu_config.hw - fc ..\apr-util\include\private\apu_config.hw ..\apr-util\include\private\apu_config.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_config.hw > ..\apr-util\include\private\apu_config.h - - ..\apr-util\include\private\apu_config.h;%(Outputs) - Creating apu_config.h from apu_config.hw - fc ..\apr-util\include\private\apu_config.hw ..\apr-util\include\private\apu_config.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_config.hw > ..\apr-util\include\private\apu_config.h - - ..\apr-util\include\private\apu_config.h;%(Outputs) - Creating apu_config.h from apu_config.hw - fc ..\apr-util\include\private\apu_config.hw ..\apr-util\include\private\apu_config.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_config.hw > ..\apr-util\include\private\apu_config.h - - ..\apr-util\include\private\apu_config.h;%(Outputs) - Creating apu_config.h from apu_config.hw - fc ..\apr-util\include\private\apu_config.hw ..\apr-util\include\private\apu_config.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_config.hw > ..\apr-util\include\private\apu_config.h - - ..\apr-util\include\private\apu_config.h;%(Outputs) - - - - Creating apu_select_dbm.h from apu_select_dbm.hw - fc ..\apr-util\include\private\apu_select_dbm.hw ..\apr-util\include\private\apu_select_dbm.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_select_dbm.hw > ..\apr-util\include\private\apu_select_dbm.h - - ..\apr-util\include\private\apu_select_dbm.h;%(Outputs) - Creating apu_select_dbm.h from apu_select_dbm.hw - fc ..\apr-util\include\private\apu_select_dbm.hw ..\apr-util\include\private\apu_select_dbm.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_select_dbm.hw > ..\apr-util\include\private\apu_select_dbm.h - - ..\apr-util\include\private\apu_select_dbm.h;%(Outputs) - Creating apu_select_dbm.h from apu_select_dbm.hw - fc ..\apr-util\include\private\apu_select_dbm.hw ..\apr-util\include\private\apu_select_dbm.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_select_dbm.hw > ..\apr-util\include\private\apu_select_dbm.h - - ..\apr-util\include\private\apu_select_dbm.h;%(Outputs) - Creating apu_select_dbm.h from apu_select_dbm.hw - fc ..\apr-util\include\private\apu_select_dbm.hw ..\apr-util\include\private\apu_select_dbm.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\private\apu_select_dbm.hw > ..\apr-util\include\private\apu_select_dbm.h - - ..\apr-util\include\private\apu_select_dbm.h;%(Outputs) - - - - - Creating apu_want.h from apu_want.hw - fc ..\apr-util\include\apu_want.hw ..\apr-util\include\apu_want.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu_want.hw > ..\apr-util\include\apu_want.h - - ..\apr-util\include\apu_want.h;%(Outputs) - Creating apu_want.h from apu_want.hw - fc ..\apr-util\include\apu_want.hw ..\apr-util\include\apu_want.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu_want.hw > ..\apr-util\include\apu_want.h - - ..\apr-util\include\apu_want.h;%(Outputs) - Creating apu_want.h from apu_want.hw - fc ..\apr-util\include\apu_want.hw ..\apr-util\include\apu_want.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu_want.hw > ..\apr-util\include\apu_want.h - - ..\apr-util\include\apu_want.h;%(Outputs) - Creating apu_want.h from apu_want.hw - fc ..\apr-util\include\apu_want.hw ..\apr-util\include\apu_want.h >NUL 2>NUL -if errorlevel 1 type ..\apr-util\include\apu_want.hw > ..\apr-util\include\apu_want.h - - ..\apr-util\include\apu_want.h;%(Outputs) - - - - - \TortoiseGit\ext\apr-util;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr-util;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr-util;%(AdditionalIncludeDirectories) - \TortoiseGit\ext\apr-util;%(AdditionalIncludeDirectories) - - - - - {4472028d-4acf-474e-aa95-9b7e12b50f60} - false - - - {ae6aafba-9992-452a-9eb8-dd69402a4ace} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9} + libaprutil + + + + DynamicLibrary + v110_xp + true + + + DynamicLibrary + v110_xp + + + DynamicLibrary + v110_xp + true + + + DynamicLibrary + v110_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 + + + $(ProjectName)_tsvn32 + + + $(ProjectName)_tsvn32 + + + $(ProjectName)_tsvn + + + $(ProjectName)_tsvn + + + + fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL +if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw + + + + ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) + WIN32;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing + + + APU_VERSION_ONLY;%(PreprocessorDefinitions) + ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + 0x6EE60000 + + + Embed .manifest + if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 + + + + + fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL +if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw + + + + ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) + APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing + + + APU_VERSION_ONLY;%(PreprocessorDefinitions) + ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + 0x6EE60000 + + + Embed .manifest + if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 + + + + + fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL +if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw + + + + ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) + WIN32;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing + + + APU_VERSION_ONLY;%(PreprocessorDefinitions) + ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + 0x6EE60000 + + + Embed .manifest + if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 + + + + + fc apu.hw ..\apr-util\include\apu.hw >NUL 2>NUL +if errorlevel 1 type apu.hw >..\apr-util\include\apu.hw + + + + ..\apr-util\include;..\apr\include;..\apr-util\include\private;..\apr-util\dbm\sdbm;..\apr-util\xml\expat\lib;%(AdditionalIncludeDirectories) + WIN32;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing + + + APU_VERSION_ONLY;%(PreprocessorDefinitions) + ..\apr-util\include;..\apr\include;%(AdditionalIncludeDirectories) + + + ws2_32.lib;mswsock.lib;%(AdditionalDependencies) + 0x6EE60000 + + + Embed .manifest + if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath)%3b2 + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Creating apr_ldap.h from apr_ldap.hw + fc ..\apr-util\include\apr_ldap.hw ..\apr-util\include\apr_ldap.h >NUL 2>NUL +if errorlevel 1 type ..\apr-util\include\apr_ldap.hw > ..\apr-util\include\apr_ldap.h + + ..\apr-util\include\apr_ldap.h;%(Outputs) + + + + + Creating apu.h from apu.hw + fc ..\apr-util\include\apu.hw ..\apr-util\include\apu.h >NUL 2>NUL +if errorlevel 1 type ..\apr-util\include\apu.hw > ..\apr-util\include\apu.h + + ..\apr-util\include\apu.h;%(Outputs) + + + + Creating apu_config.h from apu_config.hw + fc ..\apr-util\include\private\apu_config.hw ..\apr-util\include\private\apu_config.h >NUL 2>NUL +if errorlevel 1 type ..\apr-util\include\private\apu_config.hw > ..\apr-util\include\private\apu_config.h + + ..\apr-util\include\private\apu_config.h;%(Outputs) + + + + Creating apu_select_dbm.h from apu_select_dbm.hw + fc ..\apr-util\include\private\apu_select_dbm.hw ..\apr-util\include\private\apu_select_dbm.h >NUL 2>NUL +if errorlevel 1 type ..\apr-util\include\private\apu_select_dbm.hw > ..\apr-util\include\private\apu_select_dbm.h + + ..\apr-util\include\private\apu_select_dbm.h;%(Outputs) + + + + + Creating apu_want.h from apu_want.hw + fc ..\apr-util\include\apu_want.hw ..\apr-util\include\apu_want.h >NUL 2>NUL +if errorlevel 1 type ..\apr-util\include\apu_want.hw > ..\apr-util\include\apu_want.h + + ..\apr-util\include\apu_want.h;%(Outputs) + + + + + + + + + {4472028d-4acf-474e-aa95-9b7e12b50f60} + false + + + {ae6aafba-9992-452a-9eb8-dd69402a4ace} + false + + + + + + \ No newline at end of file diff --git a/ext/build/libcurl.vcxproj b/ext/build/libcurl.vcxproj index f7ed3a4aa..df40daa07 100644 --- a/ext/build/libcurl.vcxproj +++ b/ext/build/libcurl.vcxproj @@ -26,26 +26,22 @@ DynamicLibrary v110_xp - false MultiByte DynamicLibrary v110_xp - false MultiByte true DynamicLibrary v110_xp - false MultiByte DynamicLibrary v110_xp - false MultiByte true @@ -54,219 +50,77 @@ - + + - + + - + + - + + <_ProjectFileVersion>11.0.51106.1 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libcurl\$(Configuration)\ - false $(TargetName)32 - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libcurl\$(Configuration)64\ - false - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libcurl\$(Configuration)\ - false - libcurld32 - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libcurl\$(Configuration)64\ - false + $(TargetName)32 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release\vc6libcurl.tlb - - - MaxSpeed - true - true ..\libcurl\lib;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\vc6libcurl.pch - $(SolutionDir)..\bin\Release\bin\libcurl.pdb - Level3 - true + BUILDING_LIBCURL;%(PreprocessorDefinitions) + NotUsing + TurnOffAllWarnings - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ws2_32.lib;wldap32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Release\bin\libcurl32.dll - true - true - UseLinkTimeCodeGeneration - true - $(SolutionDir)..\bin\Release\bin\libcurl32.lib - MachineX86 - - true - .\Release\vc6libcurl.bsc - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release64\vc6libcurl.tlb - - - MaxSpeed - true - true ..\libcurl\lib;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;BUILDING_LIBCURL;WIN64;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)vc6libcurl.pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true + BUILDING_LIBCURL;%(PreprocessorDefinitions) + NotUsing + TurnOffAllWarnings - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ws2_32.lib;wldap32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Release64\bin\libcurl.dll - true - true - UseLinkTimeCodeGeneration - true - $(SolutionDir)..\bin\Release64\bin\libcurl.lib - MachineX64 - - true - .\Release64\vc6libcurl.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\vc6libcurl.tlb - - - Disabled ..\libcurl\lib;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug\vc6libcurl.pch - $(SolutionDir)..\bin\Debug\bin\libcurld.pdb - Level3 - true - ProgramDatabase + BUILDING_LIBCURL;%(PreprocessorDefinitions) + NotUsing + TurnOffAllWarnings - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ws2_32.lib;wldap32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Debug\bin\libcurld32.dll - true - true - $(SolutionDir)..\bin\Debug\bin\libcurld32.pdb - true - $(IntDir)libcurld32.map - false - - $(SolutionDir)..\bin\Debug\bin\libcurld32.lib - MachineX86 - - true - .\Debug\vc6libcurl.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug64\vc6libcurl.tlb - - - Disabled ..\libcurl\lib;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;BUILDING_LIBCURL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug64\vc6libcurl.pch - $(SolutionDir)..\bin\Debug64\bin\libcurld.pdb - Level3 - true - ProgramDatabase + BUILDING_LIBCURL;%(PreprocessorDefinitions) + NotUsing + TurnOffAllWarnings - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ws2_32.lib;wldap32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Debug64\bin\libcurld.dll - true - true - $(SolutionDir)..\bin\Debug64\bin\libcurl.pdb - true - $(IntDir)libcurld.map - false - - $(SolutionDir)..\bin\Debug64\bin\libcurld.lib - MachineX64 - - true - .\Debug64\vc6libcurl.bsc - @@ -443,22 +297,10 @@ - Creating curlbuild.h from curlbuild.h.dist - type ..\libcurl\include\curl\curlbuild.h.dist > ..\libcurl\include\curl\curlbuild.h - - ..\libcurl\include\curl\curlbuild.h;%(Outputs) - Creating curlbuild.h from curlbuild.h.dist - type ..\libcurl\include\curl\curlbuild.h.dist > ..\libcurl\include\curl\curlbuild.h - - ..\libcurl\include\curl\curlbuild.h;%(Outputs) - Creating curlbuild.h from curlbuild.h.dist - type ..\libcurl\include\curl\curlbuild.h.dist > ..\libcurl\include\curl\curlbuild.h - - ..\libcurl\include\curl\curlbuild.h;%(Outputs) - Creating curlbuild.h from curlbuild.h.dist - type ..\libcurl\include\curl\curlbuild.h.dist > ..\libcurl\include\curl\curlbuild.h + Creating curlbuild.h from curlbuild.h.dist + type ..\libcurl\include\curl\curlbuild.h.dist > ..\libcurl\include\curl\curlbuild.h - ..\libcurl\include\curl\curlbuild.h;%(Outputs) + ..\libcurl\include\curl\curlbuild.h;%(Outputs) diff --git a/ext/build/libgit.vcxproj b/ext/build/libgit.vcxproj index b81a879ce..07fc4c311 100644 --- a/ext/build/libgit.vcxproj +++ b/ext/build/libgit.vcxproj @@ -51,101 +51,58 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\libgit\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\libgit\$(Configuration)64\ - - - $(SolutionDir)..\bin\$(Configuration)\bin\ - $(SolutionDir)..\obj\libgit\$(Configuration)\ - - - $(SolutionDir)..\bin\$(Configuration)64\bin\ - $(SolutionDir)..\obj\libgit\$(Configuration)64\ - - Disabled - OnlyExplicitInline ..\tgit;..\zlib;..\include;..\tgit\compat;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;.\;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_STRING_H;USE_WIN32_MMAP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - + HAVE_STRING_H;USE_WIN32_MMAP;%(PreprocessorDefinitions) + NotUsing TurnOffAllWarnings - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - X64 - - Disabled - OnlyExplicitInline ..\tgit;..\zlib;..\include;..\tgit\compat;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;.\;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_STRING_H;USE_WIN32_MMAP;WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - + WIN32;HAVE_STRING_H;USE_WIN32_MMAP;WIN64;%(PreprocessorDefinitions) + NotUsing TurnOffAllWarnings - ProgramDatabase - 4996;%(DisableSpecificWarnings) - MaxSpeed - true ..\tgit;..\zlib;..\include;..\tgit\compat;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;.\;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;HAVE_STRING_H;USE_WIN32_MMAP;%(PreprocessorDefinitions) - true - true - Default - MultiThreadedDLL - + HAVE_STRING_H;USE_WIN32_MMAP;%(PreprocessorDefinitions) + NotUsing TurnOffAllWarnings - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - X64 - - MaxSpeed - true ..\tgit;..\zlib;..\include;..\tgit\compat;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;.\;..\libcurl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_STRING_H;USE_WIN32_MMAP;WIN64;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - + WIN32;HAVE_STRING_H;USE_WIN32_MMAP;WIN64;%(PreprocessorDefinitions) + NotUsing TurnOffAllWarnings - ProgramDatabase - 4996;%(DisableSpecificWarnings) @@ -162,10 +119,7 @@ - REGEX_MALLOC;%(PreprocessorDefinitions) - REGEX_MALLOC;%(PreprocessorDefinitions) - REGEX_MALLOC;%(PreprocessorDefinitions) - REGEX_MALLOC;%(PreprocessorDefinitions) + REGEX_MALLOC;%(PreprocessorDefinitions) @@ -318,24 +272,15 @@ - $(IntDir)BuildInArchive.obj - $(IntDir)BuildInArchive.obj - $(IntDir)BuildInArchive.obj - $(IntDir)BuildInArchive.obj + $(IntDir)BuildInArchive.obj - $(IntDir)BuildInBranch.obj - $(IntDir)BuildInBranch.obj - $(IntDir)BuildInBranch.obj - $(IntDir)BuildInBranch.obj + $(IntDir)BuildInBranch.obj - $(IntDir)BuildInBundle.obj - $(IntDir)BuildInBundle.obj - $(IntDir)BuildInBundle.obj - $(IntDir)BuildInBundle.obj + $(IntDir)BuildInBundle.obj @@ -346,16 +291,10 @@ - $(IntDir)BuildInCommit.obj - $(IntDir)BuildInCommit.obj - $(IntDir)BuildInCommit.obj - $(IntDir)BuildInCommit.obj + $(IntDir)BuildInCommit.obj - $(IntDir)BuildInConfig.obj - $(IntDir)BuildInConfig.obj - $(IntDir)BuildInConfig.obj - $(IntDir)BuildInConfig.obj + $(IntDir)BuildInConfig.obj @@ -363,10 +302,7 @@ - $(IntDir)BuildInDiff.obj - $(IntDir)BuildInDiff.obj - $(IntDir)BuildInDiff.obj - $(IntDir)BuildInDiff.obj + $(IntDir)BuildInDiff.obj @@ -374,24 +310,15 @@ - $(IntDir)buildInfsck.obj - $(IntDir)buildInfsck.obj - $(IntDir)buildInfsck.obj - $(IntDir)buildInfsck.obj + $(IntDir)buildInfsck.obj - $(IntDir)BuildInGrep.obj - $(IntDir)BuildInGrep.obj - $(IntDir)BuildInGrep.obj - $(IntDir)BuildInGrep.obj + $(IntDir)BuildInGrep.obj - $(IntDir)BuildInHelp.obj - $(IntDir)BuildInHelp.obj - $(IntDir)BuildInHelp.obj - $(IntDir)BuildInHelp.obj + $(IntDir)BuildInHelp.obj @@ -403,43 +330,28 @@ - $(IntDir)BuildInMergeFile.obj - $(IntDir)BuildInMergeFile.obj - $(IntDir)BuildInMergeFile.obj - $(IntDir)BuildInMergeFile.obj + $(IntDir)BuildInMergeFile.obj - $(IntDir)BuildInMergeRecursive.obj - $(IntDir)BuildInMergeRecursive.obj - $(IntDir)BuildInMergeRecursive.obj - $(IntDir)BuildInMergeRecursive.obj + $(IntDir)BuildInMergeRecursive.obj - $(IntDir)BuildInMerge.obj - $(IntDir)BuildInMerge.obj - $(IntDir)BuildInMerge.obj - $(IntDir)BuildInMerge.obj + $(IntDir)BuildInMerge.obj - $(IntDir)BuildInNotes.obj - $(IntDir)BuildInNotes.obj - $(IntDir)BuildInNotes.obj - $(IntDir)BuildInNotes.obj + $(IntDir)BuildInNotes.obj - $(IntDir)BuildInPackRefs.obj - $(IntDir)BuildInPackRefs.obj - $(IntDir)BuildInPackRefs.obj - $(IntDir)BuildInPackRefs.obj + $(IntDir)BuildInPackRefs.obj @@ -451,17 +363,11 @@ - $(IntDir)BuildInRemote.obj - $(IntDir)BuildInRemote.obj - $(IntDir)BuildInRemote.obj - $(IntDir)BuildInRemote.obj + $(IntDir)BuildInRemote.obj - $(IntDir)BuildInRerer.obj - $(IntDir)BuildInRerer.obj - $(IntDir)BuildInRerer.obj - $(IntDir)BuildInRerer.obj + $(IntDir)BuildInRerer.obj @@ -474,10 +380,7 @@ - $(IntDir)BuildInTag.obj - $(IntDir)BuildInTag.obj - $(IntDir)BuildInTag.obj - $(IntDir)BuildInTag.obj + $(IntDir)BuildInTag.obj @@ -592,9 +495,4 @@ - - - - - \ No newline at end of file diff --git a/ext/build/libgit2.vcxproj b/ext/build/libgit2.vcxproj index e40ba79c2..07188a749 100644 --- a/ext/build/libgit2.vcxproj +++ b/ext/build/libgit2.vcxproj @@ -51,144 +51,67 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libgit2\$(Configuration)\ - $(ProjectName)32d - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libgit2\$(Configuration)64\ + $(ProjectName)32 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\libgit2\$(Configuration)\ $(ProjectName)32 - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\libgit2\$(Configuration)64\ - - Disabled - ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) - _DEBUG;GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - precompiled.h - Level3 - EditAndContinue + ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) + GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) CompileAsC precompiled.h;%(ForcedIncludeFiles) - - $(OutDir)$(ProjectName)32d.dll - true - false - Windows - false - - MachineX86 - - - X64 - - Disabled - ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) - _DEBUG;GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - precompiled.h - Level3 - ProgramDatabase + ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) + GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) CompileAsC precompiled.h;%(ForcedIncludeFiles) - - true - Windows - false - - MachineX64 - - MaxSpeed - true - ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) - NDEBUG;GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use + ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) + GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) precompiled.h - Level3 - ProgramDatabase CompileAsC precompiled.h;%(ForcedIncludeFiles) - - $(OutDir)$(ProjectName)32.dll - true - Windows - true - true - UseLinkTimeCodeGeneration - true - MachineX86 - - - X64 - - MaxSpeed - true - ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) - NDEBUG;GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use + ..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\regex;%(AdditionalIncludeDirectories) + GIT_WINHTTP;WIN32_SHA1;%(PreprocessorDefinitions) precompiled.h - Level3 - ProgramDatabase CompileAsC precompiled.h;%(ForcedIncludeFiles) - - true - Windows - true - true - UseLinkTimeCodeGeneration - true - MachineX64 - @@ -266,10 +189,7 @@ - Create - Create - Create - Create + Create @@ -287,7 +207,6 @@ - @@ -396,14 +315,11 @@ - - - INCLUDE_LIB;%(PreprocessorDefinitions) - + diff --git a/ext/build/libgit2.vcxproj.filters b/ext/build/libgit2.vcxproj.filters index 7355ce350..29ae77c91 100644 --- a/ext/build/libgit2.vcxproj.filters +++ b/ext/build/libgit2.vcxproj.filters @@ -36,9 +36,6 @@ {cbf536ec-3a80-4f49-ac19-fc89222aedff} - - {db53eeb4-b84c-4812-b337-c17867a1745b} - {3befca28-4256-4931-8c11-42ab4d7a69bc} @@ -320,9 +317,6 @@ Source Files\hash - - deps\http-parser - deps\regex @@ -643,9 +637,6 @@ Public Header Files - - deps\http-parser - deps\regex diff --git a/ext/build/ogdf.vcxproj b/ext/build/ogdf.vcxproj index b07428e4d..ff4398323 100644 --- a/ext/build/ogdf.vcxproj +++ b/ext/build/ogdf.vcxproj @@ -51,98 +51,56 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\ogdf\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\ogdf\$(Configuration)64\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\ogdf\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\ogdf\$(Configuration)64\ - - Disabled ..\ogdf;%(AdditionalIncludeDirectories) OGDF_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level3 - EditAndContinue + TurnOffAllWarnings + NotUsing - - X64 - - Disabled ..\ogdf;%(AdditionalIncludeDirectories) OGDF_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - - Level3 - ProgramDatabase + TurnOffAllWarnings + NotUsing - MaxSpeed - true - true ..\ogdf;%(AdditionalIncludeDirectories) - true - MultiThreadedDLL - true - true - - Level3 - ProgramDatabase + TurnOffAllWarnings + NotUsing - - X64 - - MaxSpeed - true - true ..\ogdf;%(AdditionalIncludeDirectories) - true - MultiThreadedDLL - true - true - - Level3 - ProgramDatabase + TurnOffAllWarnings + NotUsing diff --git a/ext/build/xml.vcxproj b/ext/build/xml.vcxproj index decef6b4d..24f4fc974 100644 --- a/ext/build/xml.vcxproj +++ b/ext/build/xml.vcxproj @@ -26,27 +26,23 @@ StaticLibrary v110_xp - false MultiByte true StaticLibrary v110_xp - false MultiByte StaticLibrary v110_xp - false MultiByte true StaticLibrary v110_xp - false MultiByte @@ -54,159 +50,59 @@ - + + - + + - + + - + + <_ProjectFileVersion>11.0.51106.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\xml\$(Configuration)\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\xml\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\xml\$(Configuration)64\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\xml\$(Configuration)64\ - - /EHsc %(AdditionalOptions) - Disabled ..\apr-util\xml\expat\lib;.;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug\xml.pch - .\Debug\ - $(IntDir) - $(OutDir)xml - Level3 - true - ProgramDatabase + COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - 0x0409 - - - $(OutDir)xml.lib - true - - - true - .\Debug\xml.bsc - - MaxSpeed - true - true ..\apr-util\xml\expat\lib;.;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\xml.pch - .\Release\ - $(IntDir) - $(OutDir)xml - Level3 - true - ProgramDatabase + COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - 0x0409 - - - $(OutDir)xml.lib - true - - - true - .\Release\xml.bsc - - - X64 - - /EHsc %(AdditionalOptions) - Disabled ..\apr-util\xml\expat\lib;.;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - .\Debug64\xml.pch - .\Debug64\ - $(IntDir) - $(OutDir)xml - Level3 - true - ProgramDatabase + WIN32;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - 0x0409 - - - $(OutDir)xml.lib - true - - - true - .\LibD/xml.bsc - - - X64 - - MaxSpeed - true - true ..\apr-util\xml\expat\lib;.;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release64\xml.pch - .\Release64\ - $(IntDir) - $(OutDir)xml - Level3 - true - ProgramDatabase + WIN32;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - 0x0409 - - - $(OutDir)xml.lib - true - - - true - .\LibR/xml.bsc - diff --git a/ext/build/zlib.vcxproj b/ext/build/zlib.vcxproj dissimilarity index 67% index 2e682f8fa..601ba75c9 100644 --- a/ext/build/zlib.vcxproj +++ b/ext/build/zlib.vcxproj @@ -1,345 +1,158 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C6B6A95-2053-4593-9617-C4F176736D5A} - zlib - - - - DynamicLibrary - v110_xp - false - - - DynamicLibrary - v110_xp - false - true - - - DynamicLibrary - v110_xp - false - - - DynamicLibrary - v110_xp - false - true - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\zlib\$(Configuration)\ - false - zlib132 - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\zlib\$(Configuration)64\ - false - zlib1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\zlib\$(Configuration)\ - true - zlib1d32 - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\zlib\$(Configuration)64\ - true - zlib1d - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release\zlib.tlb - - - - MaxSpeed - true - true - WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release\zlib.pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Release\bin\zlib132.dll - true - ..\zlib\win32\zlib.def - $(SolutionDir)..\bin\Release\bin\zlib132.pdb - true - true - UseLinkTimeCodeGeneration - true - $(SolutionDir)..\bin\Release\bin\zlib132.lib - MachineX86 - - - true - .\Release\zlib.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release64\zlib.tlb - - - - MaxSpeed - true - true - WIN32;NDEBUG;WIN64;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release64\zlib.pch - $(IntDir) - $(IntDir) - $(IntDir)zlib.pdb - Level3 - true - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Release64\bin\zlib1.dll - true - ..\zlib\win32\zlib.def - $(SolutionDir)..\bin\Release64\bin\zlib1.pdb - true - true - UseLinkTimeCodeGeneration - true - $(SolutionDir)..\bin\Release64\bin\zlib1.lib - MachineX64 - - - true - .\Release64\zlib.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\zlib.tlb - - - - Disabled - WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug\zlib.pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - EditAndContinue - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Debug\bin\zlib1d32.dll - true - ..\zlib\win32\zlib.def - true - $(SolutionDir)..\bin\Debug\bin\zlib1d32.pdb - false - - $(SolutionDir)..\bin\Debug\bin\zlib1d32.lib - MachineX86 - - - true - .\Debug\zlib.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug64\zlib.tlb - - - - Disabled - WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug64\zlib.pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\bin\Debug64\bin\zlib1d.dll - true - ..\zlib\win32\zlib.def - true - $(SolutionDir)..\bin\Debug64\bin\zlib1d.pdb - false - - $(SolutionDir)..\bin\Debug64\bin\zlib1d.lib - MachineX64 - - - true - .\Debug64\zlib.bsc - - - - - - - - - - - - - - - - - - - - true - ..\zlib;%(AdditionalIncludeDirectories) - true - ..\zlib;%(AdditionalIncludeDirectories) - true - ..\zlib;%(AdditionalIncludeDirectories) - true - ..\zlib;%(AdditionalIncludeDirectories) - - - - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - \gitbuild\ext\zlib\win32;%(AdditionalIncludeDirectories) - \gitbuild\ext\zlib\win32;%(AdditionalIncludeDirectories) - \gitbuild\ext\zlib\win32;%(AdditionalIncludeDirectories) - \gitbuild\ext\zlib\win32;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C6B6A95-2053-4593-9617-C4F176736D5A} + zlib + + + + DynamicLibrary + v110_xp + + + DynamicLibrary + v110_xp + true + + + DynamicLibrary + v110_xp + + + DynamicLibrary + v110_xp + true + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 + + + $(ProjectName)132 + + + $(ProjectName)1 + + + $(ProjectName)132 + + + $(ProjectName)1 + + + + NotUsing + TurnOffAllWarnings + + + ..\zlib\win32\zlib.def + + + + + NotUsing + TurnOffAllWarnings + + + ..\zlib\win32\zlib.def + + + + + NotUsing + TurnOffAllWarnings + + + ..\zlib\win32\zlib.def + + + + + NotUsing + TurnOffAllWarnings + + + ..\zlib\win32\zlib.def + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ext/build/zlib.vcxproj.filters b/ext/build/zlib.vcxproj.filters index 1135a70d7..17f70f95c 100644 --- a/ext/build/zlib.vcxproj.filters +++ b/ext/build/zlib.vcxproj.filters @@ -13,10 +13,6 @@ {c8c5699c-9ad7-4efe-acc5-7adf452c898c} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - {3b5c446e-a212-40e7-86fb-7a6ea1e43b80} - asm;obj;c;cpp;cxx;h;hpp;hxx - @@ -64,14 +60,6 @@ Source Files - - Assembler Files %28Unsupported%29 - - - - - Source Files - @@ -114,11 +102,6 @@ - - Assembler Files %28Unsupported%29 - - - Assembler Files %28Unsupported%29 - + \ No newline at end of file diff --git a/ext/gitdll/gitdll.vcxproj b/ext/gitdll/gitdll.vcxproj index 7171633ab..6297a3062 100644 --- a/ext/gitdll/gitdll.vcxproj +++ b/ext/gitdll/gitdll.vcxproj @@ -51,151 +51,77 @@ + + + + + + + + <_ProjectFileVersion>11.0.51106.1 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\gitdll\$(Configuration)\ - true $(ProjectName)32 - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\gitdll\$(Configuration)64\ - true - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\gitdll\$(Configuration)\ - false $(ProjectName)32 - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\gitdll\$(Configuration)64\ - false - - Disabled ..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue + GITDLL_EXPORTS;%(PreprocessorDefinitions) + NotUsing wininet.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)32.dll - true - true - Windows - MachineX86 - - X64 - - Disabled ..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase + WIN32;GITDLL_EXPORTS;%(PreprocessorDefinitions) + NotUsing wininet.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - MachineX64 - MaxSpeed - true ..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase + GITDLL_EXPORTS;%(PreprocessorDefinitions) + NotUsing wininet.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)32.dll - true - Windows - true - true - true - MachineX86 - - X64 - - MaxSpeed - true ..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;WIN64;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase + WIN32;GITDLL_EXPORTS;%(PreprocessorDefinitions) + NotUsing wininet.lib;ws2_32.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX64 - - - - false - - - false - - - false - - - false - + diff --git a/ext/gitdlltest/gitdlltest.vcxproj b/ext/gitdlltest/gitdlltest.vcxproj index 5e8137969..c3293d5d9 100644 --- a/ext/gitdlltest/gitdlltest.vcxproj +++ b/ext/gitdlltest/gitdlltest.vcxproj @@ -37,13 +37,13 @@ Application - v110 + v110_xp Unicode true Application - v110 + v110_xp Unicode @@ -66,23 +66,23 @@ <_ProjectFileVersion>11.0.51106.1 - $(SolutionDir)\..\bin\$(Configuration)\bin\ - $(Configuration)\ + $(SolutionDir)..\bin\$(Configuration)\bin\ + ..\..\obj\gitdlltest\$(Configuration)\ true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)64\ + $(SolutionDir)..\bin\$(Configuration)64\bin\ + ..\..\obj\gitdlltest\$(Configuration)64\ true - $(SolutionDir)\..\bin\$(Configuration)\bin\ - $(Configuration)\ + $(SolutionDir)..\bin\$(Configuration)\bin\ + ..\..\obj\gitdlltest\$(Configuration)\ false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(SolutionDir)..\bin\$(Configuration)64\bin\ + ..\..\obj\gitdlltest\$(Configuration)64\ false @@ -170,10 +170,7 @@ - Create - Create - Create - Create + Create diff --git a/ext/hunspell/hunspell.vcxproj b/ext/hunspell/hunspell.vcxproj index e4305ec7a..91e90ecd1 100644 --- a/ext/hunspell/hunspell.vcxproj +++ b/ext/hunspell/hunspell.vcxproj @@ -26,26 +26,22 @@ StaticLibrary v110_xp - false MultiByte StaticLibrary v110_xp - false MultiByte true StaticLibrary v110_xp - false MultiByte StaticLibrary v110_xp - false MultiByte true @@ -54,155 +50,55 @@ - + + - + + - + + - + + <_ProjectFileVersion>11.0.51106.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\hunspell\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\hunspell\$(Configuration)64\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\hunspell\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\hunspell\$(Configuration)64\ - - true - false - NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release/hunspell.pch - $(IntDir) - $(IntDir) - Level3 - true - 4996;4018;%(DisableSpecificWarnings) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4100;4244;4267;%(DisableSpecificWarnings) + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x040e - - - $(OutDir)$(ProjectName).lib - true - - - true - .\Release/hunspell.bsc - - - X64 - - true - false - NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - .\Release/hunspell.pch - $(IntDir) - $(IntDir) - Level3 - true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4100;4244;4267;%(DisableSpecificWarnings) + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x040e - - - $(OutDir)$(ProjectName).lib - true - - - true - .\Release/hunspell.bsc - - Disabled - _DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/hunspell.pch - $(IntDir) - $(IntDir) - Level3 - true - EditAndContinue - 4996;4018;%(DisableSpecificWarnings) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4100;4244;4267;%(DisableSpecificWarnings) + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x040e - - - $(OutDir)$(ProjectName).lib - true - - - true - .\Debug/hunspell.bsc - - - X64 - - Disabled - _DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - .\Debug/hunspell.pch - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4100;4244;4267;%(DisableSpecificWarnings) + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x040e - - - $(OutDir)$(ProjectName).lib - true - - - true - .\Debug/hunspell.bsc - diff --git a/src/AsyncFramework/AsyncFramework.vcxproj b/src/AsyncFramework/AsyncFramework.vcxproj index f98a93ea3..a27f27414 100644 --- a/src/AsyncFramework/AsyncFramework.vcxproj +++ b/src/AsyncFramework/AsyncFramework.vcxproj @@ -21,7 +21,7 @@ {98E4E6D3-0EF6-4570-A29E-274DACF3B784} AsyncFramework - ManagedCProj + Win32Proj @@ -35,7 +35,6 @@ StaticLibrary v110_xp Unicode - false StaticLibrary @@ -55,109 +54,34 @@ + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\AsyncFramework\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\AsyncFramework\$(Configuration)64\ + <_ProjectFileVersion>10.0.30319.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\AsyncFramework\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\AsyncFramework\$(Configuration)64\ - - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - - - X64 - - - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - - - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - - - - X64 - - - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - - - - true - true - - - true - true - - - true - true - - - Create - Create - Create - Create + Create diff --git a/src/Git/Git.vcxproj b/src/Git/Git.vcxproj index 1e6b529ad..77096f97e 100644 --- a/src/Git/Git.vcxproj +++ b/src/Git/Git.vcxproj @@ -35,7 +35,6 @@ StaticLibrary v110_xp Dynamic - false Unicode @@ -49,7 +48,6 @@ StaticLibrary v110_xp Dynamic - false Unicode @@ -57,94 +55,46 @@ + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\git\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\git\$(Configuration)64\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\git\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\git\$(Configuration)64\ + <_ProjectFileVersion>10.0.30319.1 - Disabled ..\TortoiseShell;..\utils;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - - X64 - - Disabled ..\TortoiseShell;..\utils;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - true - false ..\TortoiseShell;..\utils;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - X64 - - true - false ..\TortoiseShell;..\utils;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase @@ -157,10 +107,7 @@ - Create - Create - Create - Create + Create diff --git a/src/IBugTraqProvider/IBugTraqProvider.vcxproj b/src/IBugTraqProvider/IBugTraqProvider.vcxproj index 97969ca40..560fa81a3 100644 --- a/src/IBugTraqProvider/IBugTraqProvider.vcxproj +++ b/src/IBugTraqProvider/IBugTraqProvider.vcxproj @@ -51,65 +51,42 @@ + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\obj\$(ProjectName)\$(Configuration)\ - ..\..\obj\$(ProjectName)\$(Configuration)\ - - - ..\..\obj\$(ProjectName)\$(Configuration)64\ - ..\..\obj\$(ProjectName)\$(Configuration)64\ - - - ..\..\obj\$(ProjectName)\$(Configuration)\ - ..\..\obj\$(ProjectName)\$(Configuration)\ - - - ..\..\obj\$(ProjectName)\$(Configuration)64\ - ..\..\obj\$(ProjectName)\$(Configuration)64\ + <_ProjectFileVersion>10.0.30319.1 false - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue + NotUsing - X64 false - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - ProgramDatabase + NotUsing @@ -117,49 +94,19 @@ false - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase + NotUsing - X64 false - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - Level3 - ProgramDatabase + NotUsing - - 4 - false - - - - - 4 - false - - - - - + diff --git a/src/ResText/ResText.vcxproj b/src/ResText/ResText.vcxproj index 08a90542c..c7b1215d0 100644 --- a/src/ResText/ResText.vcxproj +++ b/src/ResText/ResText.vcxproj @@ -51,159 +51,79 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Debug\bin\ - ..\..\obj\ResText\Debug\ - true - - - ..\..\bin\Debug64\bin\ - ..\..\obj\ResText\Debug64\ - true - - - ..\..\bin\Release\bin\ - ..\..\obj\ResText\Release\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\ResText\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - Level4 - EditAndContinue + ..\Utils;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreadedDebug shlwapi.lib;%(AdditionalDependencies) - $(OutDir)ResText.exe - true - $(OutDir)ResText.pdb Console - false - - MachineX86 - - X64 - - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - Level4 - ProgramDatabase + ..\Utils;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreadedDebug shlwapi.lib;%(AdditionalDependencies) - $(OutDir)ResText.exe - true - $(OutDir)ResText.pdb Console - false - - MachineX64 - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase + ..\Utils;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded shlwapi.lib;%(AdditionalDependencies) - true Console - true - true - true - MachineX86 + false - - X64 - - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase + ..\Utils;%(AdditionalIncludeDirectories) + _CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded shlwapi.lib;%(AdditionalDependencies) - true Console - true - true - true - MachineX64 + false - - - - - - - - + NotUsing - Create - Create - Create - Create + Create @@ -219,9 +139,4 @@ - - - - - \ No newline at end of file diff --git a/src/SshAskPass/SshAskPass.vcxproj b/src/SshAskPass/SshAskPass.vcxproj index 4728d29ff..b9edbb87d 100644 --- a/src/SshAskPass/SshAskPass.vcxproj +++ b/src/SshAskPass/SshAskPass.vcxproj @@ -51,127 +51,38 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 + <_ProjectFileVersion>10.0.30319.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\SshAskPass\$(Configuration)\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\SshAskPass\$(Configuration)\ - false - - - ..\..\bin\Debug64\bin\ - ..\..\obj\SshAskPass\Debug64\ - true - - - ..\..\bin\Release64\bin\ - ..\..\obj\SshAskPass\Release64\ - false - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - - - true - Windows - MachineX86 - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - true - Windows - true - true - true - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - true - Windows - MachineX64 + false - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - true - Windows - true - true - true - MachineX64 + false - Create - Create - Create - Create + Create diff --git a/src/TGitCache/TGitCache.vcxproj b/src/TGitCache/TGitCache.vcxproj index b3943096a..dae3a466e 100644 --- a/src/TGitCache/TGitCache.vcxproj +++ b/src/TGitCache/TGitCache.vcxproj @@ -34,7 +34,6 @@ Application v110_xp - false Static Unicode @@ -48,7 +47,6 @@ Application v110_xp - false Static Unicode @@ -57,145 +55,58 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TGitCache\$(Configuration)\ - true - true - - - ..\..\Bin\Debug64\Bin\ - ..\..\obj\TGitCache\Debug64\ - true - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TGitCache\$(Configuration)\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\TGitCache\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - Disabled ..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;UNICODE;_UNICODE;%(PreprocessorDefinitions) - true - EnableFastChecks - true - MultiThreadedDebugDLL - true - true - Use - Level4 - EditAndContinue + _CONSOLE;%(PreprocessorDefinitions) - - true - Crypt32.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 - - X64 - - Disabled ..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE;%(PreprocessorDefinitions) - true - EnableFastChecks - true - MultiThreadedDebugDLL - true - true - Use - Level4 - ProgramDatabase + _CONSOLE;%(PreprocessorDefinitions) Crypt32.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX64 - true ..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase + _CONSOLE;%(PreprocessorDefinitions) Crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX86 - - X64 - - true ..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_CONSOLE;UNICODE;_UNICODE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase + _CONSOLE;%(PreprocessorDefinitions) Crypt32.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX64 @@ -216,10 +127,7 @@ - Create - Create - Create - Create + Create diff --git a/src/TortoiseGit.common-dll.props b/src/TortoiseGit.common-dll.props new file mode 100644 index 000000000..f0ce84c2b --- /dev/null +++ b/src/TortoiseGit.common-dll.props @@ -0,0 +1,14 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + + + + _USRDLL;%(PreprocessorDefinitions) + + + $(IntDir)$(TargetName).lib + + + \ No newline at end of file diff --git a/src/TortoiseGit.common-langs.props b/src/TortoiseGit.common-langs.props new file mode 100644 index 000000000..35dd5a52f --- /dev/null +++ b/src/TortoiseGit.common-langs.props @@ -0,0 +1,25 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + + + false + + + + TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + + + ..\TortoiseShell;%(AdditionalIncludeDirectories) + + + false + true + false + Default + + + \ No newline at end of file diff --git a/src/TortoiseGit.common-staticlib.props b/src/TortoiseGit.common-staticlib.props new file mode 100644 index 000000000..441c771b2 --- /dev/null +++ b/src/TortoiseGit.common-staticlib.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + $(IntDir) + + + + _LIB;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/src/TortoiseGit.common.props b/src/TortoiseGit.common.props new file mode 100644 index 000000000..7eeacec44 --- /dev/null +++ b/src/TortoiseGit.common.props @@ -0,0 +1,87 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + true + false + $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ + $(SolutionDir)..\bin\$(Configuration)\bin\ + $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)64\ + $(SolutionDir)..\bin\$(Configuration)64\bin\ + + + + true + Sync + true + Use + stdafx.h + _WINDOWS;WINDOWS;%(PreprocessorDefinitions) + WIN32;%(PreprocessorDefinitions) + _WIN64;WIN64;%(PreprocessorDefinitions) + Level4 + + + MachineX86 + MachineX64 + + + true + true + true + Windows + MachineX86 + MachineX64 + + + Win32 + X64 + 3 + + + 0x0409 + WIN32;%(PreprocessorDefinitions) + _WIN64;WIN64;%(PreprocessorDefinitions) + + + + + EnableFastChecks + EditAndContinue + ProgramDatabase + true + Disabled + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + + + + + ProgramDatabase + AnySuitable + true + Speed + true + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + true + + + true + UseLinkTimeCodeGeneration + true + true + + + NDEBUG;%(PreprocessorDefinitions) + + + diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj index f0b2c020b..eb2d4bb47 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj @@ -28,7 +28,6 @@ Application v110_xp Dynamic - false Unicode true @@ -36,14 +35,12 @@ Application v110_xp Dynamic - false Unicode Application v110_xp Dynamic - false Unicode true @@ -51,7 +48,6 @@ Application v110_xp Dynamic - false Unicode @@ -59,171 +55,75 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseGitBlame\$(Configuration)\ - true - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\TortoiseGitBlame\$(Configuration)64\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseGitBlame\$(Configuration)\ - false - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\TortoiseGitBlame\$(Configuration)64\ - false + <_ProjectFileVersion>10.0.30319.1 - - _DEBUG;%(PreprocessorDefinitions) - false - true - - Disabled .\;..\..\ext\gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;..\TortoiseMerge;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - _DEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - MachineX86 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - _DEBUG;%(PreprocessorDefinitions) - false - X64 - - Disabled .\;..\..\ext\gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;..\TortoiseMerge;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - _DEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - MachineX64 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - NDEBUG;%(PreprocessorDefinitions) - false - true - - true .\;..\..\ext\gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;..\TortoiseMerge;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX86 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - NDEBUG;%(PreprocessorDefinitions) - false - X64 - - true .\;..\..\ext\gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;..\TortoiseMerge;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX64 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) @@ -250,10 +150,7 @@ - Create - Create - Create - Create + Create @@ -295,10 +192,7 @@ - $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) - $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) - $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) - $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) + $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) @@ -524,47 +418,8 @@ - Making help file... - start /wait hhc "hlp\TortoiseGitBlame.hhp" -if not exist "hlp\TortoiseGitBlame_en.chm" goto :HelpError -copy "hlp\TortoiseGitBlame_en.chm" "$(OutDir)TortoiseGitBlame_en.chm" -goto :HelpDone -:HelpError -echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file -echo. -:HelpDone -echo. - - hlp\HTMLDefines.h;%(AdditionalInputs) - $(OutDir)$(ProjectName).chm;%(Outputs) - Making help file... - start /wait hhc "hlp\TortoiseGitBlame.hhp" -if not exist "hlp\TortoiseGitBlame_en.chm" goto :HelpError -copy "hlp\TortoiseGitBlame_en.chm" "$(OutDir)TortoiseGitBlame_en.chm" -goto :HelpDone -:HelpError -echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file -echo. -:HelpDone -echo. - - hlp\HTMLDefines.h;%(AdditionalInputs) - $(OutDir)$(ProjectName).chm;%(Outputs) - Making help file... - start /wait hhc "hlp\TortoiseGitBlame.hhp" -if not exist "hlp\TortoiseGitBlame_en.chm" goto :HelpError -copy "hlp\TortoiseGitBlame_en.chm" "$(OutDir)TortoiseGitBlame_en.chm" -goto :HelpDone -:HelpError -echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file -echo. -:HelpDone -echo. - - hlp\HTMLDefines.h;%(AdditionalInputs) - $(OutDir)$(ProjectName).chm;%(Outputs) - Making help file... - start /wait hhc "hlp\TortoiseGitBlame.hhp" + Making help file... + start /wait hhc "hlp\TortoiseGitBlame.hhp" if not exist "hlp\TortoiseGitBlame_en.chm" goto :HelpError copy "hlp\TortoiseGitBlame_en.chm" "$(OutDir)TortoiseGitBlame_en.chm" goto :HelpDone @@ -574,8 +429,8 @@ echo. :HelpDone echo. - hlp\HTMLDefines.h;%(AdditionalInputs) - $(OutDir)$(ProjectName).chm;%(Outputs) + hlp\HTMLDefines.h;%(AdditionalInputs) + $(OutDir)$(ProjectName).chm;%(Outputs) @@ -607,9 +462,4 @@ echo. - - - - - \ No newline at end of file diff --git a/src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj b/src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj dissimilarity index 62% index fef58c566..e401045ba 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj +++ b/src/TortoiseGitBlame/TortoiseGitBlameLang.vcxproj @@ -1,212 +1,87 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4C8C72BE-FE20-4A92-A592-0D44ED849B1C} - TortoiseProcLang - Win32Proj - - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseGitBlameLang\Release\ - false - - - ..\..\bin\release64\bin\ - ..\..\obj\TortoiseGitBlameLang\Release64\ - false - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseGitBlameLang\Debug\ - false - - - ..\..\bin\debug64\bin\ - ..\..\obj\TortoiseGitBlameLang\Debug64\ - false - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - MachineX64 - - - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4C8C72BE-FE20-4A92-A592-0D44ED849B1C} + TortoiseProcLang + Win32Proj + + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + \ No newline at end of file diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj b/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj index 9cdbb5d13..6519042d9 100644 --- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj +++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj @@ -31,74 +31,40 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\..\bin\Release\bin\ - ..\..\..\obj\CustomActions\Release\ - false - - - ..\..\..\bin\Release64\bin\ - ..\..\..\obj\CustomActions\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONS_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase + CUSTOMACTIONS_EXPORTS;%(PreprocessorDefinitions) - $(OutDir)CustomActions.dll CustomActions.def - true - Windows - true - true - false - - $(OutDir)CustomActions.lib - MachineX86 + false - - X64 - - WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONS_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - Use - Level3 - ProgramDatabase + CUSTOMACTIONS_EXPORTS;%(PreprocessorDefinitions) - $(OutDir)CustomActions.dll CustomActions.def - true - Windows - true - true - false - - $(OutDir)CustomActions.lib - MachineX64 + false - Create - Create + Create diff --git a/src/TortoiseIDiff/TortoiseIDiff.vcxproj b/src/TortoiseIDiff/TortoiseIDiff.vcxproj index dde544f8d..25781b80a 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.vcxproj +++ b/src/TortoiseIDiff/TortoiseIDiff.vcxproj @@ -52,132 +52,54 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseIDiff\Debug\ - true - - - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseIDiff\Debug64\ - true - - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseIDiff\Release\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseIDiff\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - Disabled ..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue gdiplus.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 - - X64 - - Disabled ..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase gdiplus.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX64 - true ..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - Use - Level3 - ProgramDatabase gdiplus.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX86 - - X64 - - true ..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase gdiplus.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX64 @@ -193,10 +115,7 @@ - Create - Create - Create - Create + Create diff --git a/src/TortoiseIDiff/TortoiseIDiffLang.vcxproj b/src/TortoiseIDiff/TortoiseIDiffLang.vcxproj index 51b770b57..5d4cabbb5 100644 --- a/src/TortoiseIDiff/TortoiseIDiffLang.vcxproj +++ b/src/TortoiseIDiff/TortoiseIDiffLang.vcxproj @@ -49,153 +49,51 @@ + + + + + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseIDiffLang\Release\ - false - - - ..\..\bin\release64\bin\ - ..\..\obj\TortoiseIDiffLang\Release64\ - false - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseIDiffLang\Debug\ - false - - - ..\..\bin\debug64\bin\ - ..\..\obj\TortoiseIDiffLang\Debug64\ - false + <_ProjectFileVersion>10.0.30319.1 - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX64 - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX64 - - - - @@ -206,9 +104,4 @@ - - - - - \ No newline at end of file diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj b/src/TortoiseMerge/TortoiseMerge.vcxproj dissimilarity index 71% index 07cb3f776..068e54675 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj @@ -1,909 +1,450 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - TortoiseGitMerge - {8ABB4F84-891A-4748-8507-F5494842173E} - TortoiseMerge - MFCProj - - - - Application - v110_xp - Dynamic - Unicode - false - true - - - Application - v110_xp - Dynamic - Unicode - - - Application - v110_xp - Dynamic - Unicode - false - true - - - Application - v110_xp - Dynamic - Unicode - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseMerge\Debug\ - true - - - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseMerge\Debug64\ - true - - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseMerge\Release\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseMerge\Release64\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - false - - - Disabled - ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - Level4 - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - false - X64 - - - Disabled - ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) - WIN64;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - Level4 - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX64 - - - - - NDEBUG;%(PreprocessorDefinitions) - false - - - MaxSpeed - true - ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX86 - - - - - NDEBUG;%(PreprocessorDefinitions) - false - X64 - - - MaxSpeed - true - ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) - WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - true - true - true - Use - Level4 - ProgramDatabase - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(IntDir);%(AdditionalIncludeDirectories) - - - Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - WIN32;%(PreprocessorDefinitions) - - - - - WIN32;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4472028d-4acf-474e-aa95-9b7e12b50f60} - false - - - {6bd19bae-4041-4e85-b576-aac9d54caab9} - false - - - {ae6aafba-9992-452a-9eb8-dd69402a4ace} - false - - - {4f0a55de-dafd-4a0b-a03d-2c14cb77e08f} - false - - - {4be529fb-c2f2-49f7-a897-054b955564cf} - false - - - {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} - false - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + TortoiseGitMerge + {8ABB4F84-891A-4748-8507-F5494842173E} + TortoiseMerge + MFCProj + + + + Application + v110_xp + Dynamic + Unicode + true + + + Application + v110_xp + Dynamic + Unicode + + + Application + v110_xp + Dynamic + Unicode + true + + + Application + v110_xp + Dynamic + Unicode + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) + APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) + + + $(IntDir);%(AdditionalIncludeDirectories) + + + Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + + + ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) + APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) + + + $(IntDir);%(AdditionalIncludeDirectories) + + + Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + + + ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) + APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) + + + $(IntDir);%(AdditionalIncludeDirectories) + + + Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + + + ..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\;..\Utils\MiscUI;..\..\ext\ResizableLib;%(AdditionalIncludeDirectories) + APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions) + + + $(IntDir);%(AdditionalIncludeDirectories) + + + Crypt32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + NotUsing + + + + + + + + + + + + + + + + NotUsing + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + NotUsing + WIN32;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {4472028d-4acf-474e-aa95-9b7e12b50f60} + false + + + {6bd19bae-4041-4e85-b576-aac9d54caab9} + false + + + {ae6aafba-9992-452a-9eb8-dd69402a4ace} + false + + + {4f0a55de-dafd-4a0b-a03d-2c14cb77e08f} + false + + + {4be529fb-c2f2-49f7-a897-054b955564cf} + false + + + {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} + false + + + + + + \ No newline at end of file diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters index f8528bbf5..dd0075984 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters @@ -368,12 +368,6 @@ Header Files - - Header Files - - - Header Files - Header Files diff --git a/src/TortoiseMerge/TortoiseMergeLang.vcxproj b/src/TortoiseMerge/TortoiseMergeLang.vcxproj dissimilarity index 63% index 8a9b9fe80..d47d5b88e 100644 --- a/src/TortoiseMerge/TortoiseMergeLang.vcxproj +++ b/src/TortoiseMerge/TortoiseMergeLang.vcxproj @@ -1,217 +1,87 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1B3C273E-6DDF-4FBE-BA31-FCF39C6DBCF9} - TortoiseMergeLang - Win32Proj - - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - DynamicLibrary - v110_xp - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\release\bin\ - ..\..\obj\TortoiseMergeLang\Release\ - false - - - ..\..\bin\release64\bin\ - ..\..\obj\TortoiseMergeLang\Release64\ - false - - - ..\..\bin\debug\bin\ - ..\..\obj\TortoiseMergeLang\Debug\ - false - - - ..\..\bin\debug64\bin\ - ..\..\obj\TortoiseMergeLang\Debug64\ - false - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - _UNICODE;UNICODE;_DLL;%(PreprocessorDefinitions) - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX64 - - - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - _UNICODE;UNICODE;_DLL;%(PreprocessorDefinitions) - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - false - false - - $(OutDir)$(TargetName).lib - MachineX64 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1B3C273E-6DDF-4FBE-BA31-FCF39C6DBCF9} + TortoiseMergeLang + Win32Proj + + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + + + + + + + + + \ No newline at end of file diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcxproj b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcxproj index 7a4ca6e80..dda2df9f2 100644 --- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcxproj +++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcxproj @@ -27,26 +27,22 @@ Application v110_xp - false MultiByte Application v110_xp - false MultiByte true Application v110_xp - false MultiByte Application v110_xp - false MultiByte true @@ -55,207 +51,67 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\..\..\..\bin\Release\bin\ - ..\..\..\..\..\obj\TortoisePlink\Release\ - false - - - ..\..\..\..\..\bin\Release64\bin\ - ..\..\..\..\..\obj\TortoisePlink\Release64\ - false - - - ..\..\..\..\..\bin\debug\bin\ - ..\..\..\..\..\obj\TortoisePlink\debug\ - true - - - ..\..\..\..\..\bin\debug64\bin\ - ..\..\..\..\..\obj\TortoisePlink\debug64\ - true + <_ProjectFileVersion>10.0.30319.1 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/PLINK.tlb - - - true - true ..\..\..\;..\..\..\charset\;..\..\..\windows\;..\..\..\unix\;..\..\..\mac\;..\..\..\macosx\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)$(TargetName).pch - .\Release\ - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true + _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies) - Windows - false - false - UseLinkTimeCodeGeneration - true - MachineX86 - - true - .\Release\PLINK.bsc - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release\PLINK.tlb - - - true - true ..\..\..\;..\..\..\charset\;..\..\..\windows\;..\..\..\unix\;..\..\..\mac\;..\..\..\macosx\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(IntDir)$(TargetName).pch - .\Release\ - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true + _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies) - Windows - true - true - UseLinkTimeCodeGeneration - true - MachineX64 - - true - .\Release\PLINK.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\PLINK.tlb - - - Disabled ..\..\..\;..\..\..\charset\;..\..\..\windows\;..\..\..\unix\;..\..\..\mac\;..\..\..\macosx\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;SECURITY_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - EditAndContinue + _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies) - true - true - Windows - false - - MachineX86 - - true - .\Debug\PLINK.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug\PLINK.tlb - - - Disabled ..\..\..\;..\..\..\charset\;..\..\..\windows\;..\..\..\unix\;..\..\..\mac\;..\..\..\macosx\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(IntDir)$(TargetName).pch - - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true - ProgramDatabase + _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32;%(PreprocessorDefinitions) + TurnOffAllWarnings + NotUsing - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - comctl32.lib;imm32.lib;winmm.lib;%(AdditionalDependencies) - true - true - Windows - false - - MachineX64 - - true - .\Debug\PLINK.bsc - @@ -272,10 +128,7 @@ - - ProgramDatabase - ProgramDatabase - + diff --git a/src/TortoiseProc/TortoiseProc.vcxproj b/src/TortoiseProc/TortoiseProc.vcxproj index e95647138..73699d6a0 100644 --- a/src/TortoiseProc/TortoiseProc.vcxproj +++ b/src/TortoiseProc/TortoiseProc.vcxproj @@ -36,7 +36,6 @@ Application v110_xp Dynamic - false Unicode @@ -50,7 +49,6 @@ Application v110_xp Dynamic - false Unicode @@ -58,188 +56,84 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseProc\$(Configuration)\ - true - - - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseProc\Debug64\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseProc\$(Configuration)\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseProc\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - - _DEBUG;%(PreprocessorDefinitions) - false - - Disabled - ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;ENABLE_NLS;THESAURUS;%(PreprocessorDefinitions) - true + ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) + THESAURUS;%(PreprocessorDefinitions) Async - MultiThreadedDebugDLL - true - true - true - Use - Level4 - EditAndContinue - _DEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;Dnsapi.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - _DEBUG;%(PreprocessorDefinitions) - false - X64 - - Disabled - ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) - WIN64;_WINDOWS;_DEBUG;ENABLE_NLS;THESAURUS;%(PreprocessorDefinitions) - true + ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) + THESAURUS;%(PreprocessorDefinitions) Async - MultiThreadedDebugDLL - true - true - true - Use - Level4 - ProgramDatabase + - _DEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;Dnsapi.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX64 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - NDEBUG;%(PreprocessorDefinitions) - false - - true - ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;THESAURUS;%(PreprocessorDefinitions) - true - false + ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) + THESAURUS;%(PreprocessorDefinitions) Async - MultiThreadedDLL - true - true - true - true - Use - Level4 - ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;Dnsapi.lib;UxTheme.lib;%(AdditionalDependencies) - true - Windows - true - true - true - MachineX86 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - NDEBUG;%(PreprocessorDefinitions) - false - X64 - - true - ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) - WIN64;_WINDOWS;NDEBUG;THESAURUS;%(PreprocessorDefinitions) - true - false + ..\TortoiseProc;..\Resources;$InputDir;..\..\ext\ResizableLib;..\Git;..\Utils;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework;%(AdditionalIncludeDirectories) + THESAURUS;%(PreprocessorDefinitions) Async - MultiThreadedDLL - true - true - true - true - Use - Level4 - ProgramDatabase - NDEBUG;%(PreprocessorDefinitions) - 0x0409 $(IntDir);..\TortoiseShell;%(AdditionalIncludeDirectories) Crypt32.lib;gdiplus.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;Dnsapi.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - Windows - true - true - true - MachineX64 ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) @@ -405,10 +299,7 @@ - Create - Create - Create - Create + Create @@ -758,9 +649,4 @@ - - - - - \ No newline at end of file diff --git a/src/TortoiseProc/TortoiseProcLang.vcxproj b/src/TortoiseProc/TortoiseProcLang.vcxproj index aa448ffe7..b4eab6fa2 100644 --- a/src/TortoiseProc/TortoiseProcLang.vcxproj +++ b/src/TortoiseProc/TortoiseProcLang.vcxproj @@ -49,156 +49,32 @@ + + + + + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 + <_ProjectFileVersion>10.0.30319.1 - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseProcLang\Release\ - false - - - ..\..\bin\release64\bin\ - ..\..\obj\TortoiseProcLang\Release64\ - false - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseProcLang\Debug\ - false - - - ..\..\bin\debug64\bin\ - ..\..\obj\TortoiseProcLang\Debug64\ - false - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - true - false - Windows - true - true - true - true - false - $(OutDir)$(TargetName).lib - MachineX64 - - - - - - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName).dll - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX86 - - - - - - - - X64 - - - WIN32;NDEBUG;_WINDOWS;_USRDLL;TORTOISELANG_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - - - ..\TortoiseShell;%(AdditionalIncludeDirectories) - - - $(OutDir)$(ProjectName).dll - true - false - Windows - true - true - true - false - - $(OutDir)$(TargetName).lib - MachineX64 - - - - - @@ -278,26 +154,7 @@ - - - true - true - true - true - - - true - true - true - true - - - - - - - \ No newline at end of file diff --git a/src/TortoiseProc/TortoiseProcLang.vcxproj.filters b/src/TortoiseProc/TortoiseProcLang.vcxproj.filters index 96fe5bcc2..b62837af3 100644 --- a/src/TortoiseProc/TortoiseProcLang.vcxproj.filters +++ b/src/TortoiseProc/TortoiseProcLang.vcxproj.filters @@ -221,8 +221,4 @@ Resource Files - - - - \ No newline at end of file diff --git a/src/TortoiseShell/TortoiseShell.vcxproj b/src/TortoiseShell/TortoiseShell.vcxproj index 4cab8b74d..78d7bce41 100644 --- a/src/TortoiseShell/TortoiseShell.vcxproj +++ b/src/TortoiseShell/TortoiseShell.vcxproj @@ -26,7 +26,6 @@ DynamicLibrary v110_xp - false Static Unicode true @@ -34,14 +33,12 @@ DynamicLibrary v110_xp - false Static Unicode DynamicLibrary v110_xp - false Static Unicode true @@ -49,7 +46,6 @@ DynamicLibrary v110_xp - false Static Unicode @@ -58,229 +54,90 @@ + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 + <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseShell\$(Configuration)\ - true - true TortoiseGit32 - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseShell\Debug64\ - true - true TortoiseGit - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseShell\$(Configuration)\ - true - false TortoiseGit32 - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseShell\Release64\ - true - false TortoiseGit - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\TortoiseShell.tlb - - Disabled - Default ..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - StackFrameRuntimeCheck - MultiThreadedDebugDLL - true - true - Use - ..\..\obj\TortoiseShell\Debug\ - ..\..\obj\TortoiseShell\Debug\ - ..\..\obj\TortoiseShell\Debug\ - Level4 - true - EditAndContinue - Default - _DEBUG;TSVNSHELL;%(PreprocessorDefinitions) - 0x0409 + TSVNSHELL;%(PreprocessorDefinitions) - /MACHINE:I386 %(AdditionalOptions) Crypt32.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;%(AdditionalDependencies) - $(OutDir)TortoiseGit32.dll - true - .\ShellExt.def - true - $(OutDir)TortoiseGit.pdb - false - true + ShellExt.def 0x5960000 - false - - - MachineX86 - false - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug\TortoiseShell.tlb - - Disabled - Default ..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - StackFrameRuntimeCheck - MultiThreadedDebugDLL - true - true - Use - ..\..\obj\TortoiseShell\Debug64\ - ..\..\obj\TortoiseShell\Debug64\ - ..\..\obj\TortoiseShell\Debug64\ - Level4 - true - ProgramDatabase - Default - _DEBUG;TSVNSHELL;%(PreprocessorDefinitions) - 0x0409 + TSVNSHELL;%(PreprocessorDefinitions) Crypt32.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;%(AdditionalDependencies) - $(OutDir)TortoiseGit.dll - true - false - .\ShellExt.def - true - $(OutDir)TortoiseGit.pdb + ShellExt.def 0x5960000 - false - - ..\..\obj\TortoiseShell\Debug64\TortoiseGit.lib - MachineX64 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release\TortoiseShell.tlb - - true - true ..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Use - ..\..\obj\TortoiseShell\Release\ - ..\..\obj\TortoiseShell\Release\ - ..\..\obj\TortoiseShell\Release\ - Level4 - true - ProgramDatabase - Default - NDEBUG;TSVNSHELL;%(PreprocessorDefinitions) - 0x0409 + TSVNSHELL;%(PreprocessorDefinitions) Crypt32.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;%(AdditionalDependencies) - $(OutDir)TortoiseGit32.dll - true - .\ShellExt.def - true - Windows - true - true - true + ShellExt.def 0x5960000 - ..\..\obj\TortoiseShell\Release\TortoiseGit.lib - MachineX86 - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release\TortoiseShell.tlb - - true - true ..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Use - ..\..\obj\TortoiseShell\Release64\ - ..\..\obj\TortoiseShell\Release64\ - ..\..\obj\TortoiseShell\Release64\ - Level4 - true - ProgramDatabase - CompileAsCpp - NDEBUG;TSVNSHELL;%(PreprocessorDefinitions) - 0x0409 + TSVNSHELL;%(PreprocessorDefinitions) Crypt32.lib;shfolder.lib;shell32.lib;comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;version.lib;%(AdditionalDependencies) - $(OutDir)TortoiseGit.dll - true - .\ShellExt.def - true - Windows - true - true - true + ShellExt.def 0x5960000 - ..\..\obj\TortoiseShell\Release64\TortoiseGit.lib - MachineX64 @@ -307,10 +164,7 @@ - Create - Create - Create - Create + Create @@ -419,9 +273,4 @@ - - - - - \ No newline at end of file diff --git a/src/TortoiseShell/TortoiseStub.vcxproj b/src/TortoiseShell/TortoiseStub.vcxproj dissimilarity index 61% index 7e3906c62..76dd54339 100644 --- a/src/TortoiseShell/TortoiseStub.vcxproj +++ b/src/TortoiseShell/TortoiseStub.vcxproj @@ -1,294 +1,146 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - TortoiseGitStub - {DB98402B-2CF6-4EC6-89F9-D19365EE8DE3} - TortoiseStub - - - - DynamicLibrary - v110_xp - false - Unicode - true - - - DynamicLibrary - v110_xp - false - Unicode - - - DynamicLibrary - v110_xp - false - Unicode - true - - - DynamicLibrary - v110_xp - false - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\Debug\bin\ - ..\..\obj\TortoiseStub\Debug\ - true - $(ProjectName)32 - - - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseStub\Debug64\ - true - - - ..\..\bin\Release\bin\ - ..\..\obj\TortoiseStub\Release\ - false - $(ProjectName)32 - - - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseStub\Release64\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug\TortoiseStub.tlb - - - - Disabled - ..\Utils;%(AdditionalIncludeDirectories) - WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - $(IntDir)$(TargetName).pch - ..\..\obj\TortoiseStub\Debug\ - ..\..\obj\TortoiseStub\Debug/ - ..\..\obj\TortoiseStub\Debug\ - Level4 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)TortoiseGitStub32.dll - true - .\TortoiseStub.def - true - $(OutDir)TortoiseStub.pdb - false - - ..\..\obj\TortoiseStub\Debug\TortoiseStub.lib - MachineX86 - - - true - .\Debug\TortoiseStub.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug\TortoiseStub.tlb - - - - Disabled - ..\Utils;%(AdditionalIncludeDirectories) - WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - $(IntDir)$(TargetName).pch - ..\..\obj\TortoiseStub\Debug64\ - ..\..\obj\TortoiseStub\Debug64\ - ..\..\obj\TortoiseStub\Debug64\ - Level4 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)TortoiseGitStub.dll - true - .\TortoiseStub.def - true - $(OutDir)TortoiseStub.pdb - false - - ..\..\obj\TortoiseStub\Debug64\TortoiseStub.lib - MachineX64 - - - true - .\Debug\TortoiseStub.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release\TortoiseStub.tlb - - - - MaxSpeed - true - ..\Utils;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION;%(PreprocessorDefinitions) - true - - MultiThreaded - Default - true - $(IntDir)$(TargetName).pch - ..\..\obj\TortoiseStub\Release\ - ..\..\obj\TortoiseStub\Release\ - ..\..\obj\TortoiseStub\Release\ - Level4 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)TortoiseGitStub32.dll - true - .\TortoiseStub.def - $(OutDir)TortoiseStub.pdb - Windows - true - true - true - 0x5940000 - ..\..\obj\TortoiseStub\Release\TortoiseStub.lib - MachineX86 - - - true - .\Release\TortoiseStub.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release\TortoiseStub.tlb - - - - MaxSpeed - true - ..\Utils;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION;%(PreprocessorDefinitions) - true - - MultiThreaded - Default - true - $(IntDir)$(TargetName).pch - ..\..\obj\TortoiseStub\Release64\ - ..\..\obj\TortoiseStub\Release64\ - ..\..\obj\TortoiseStub\Release64\ - Level4 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - .\TortoiseStub.def - $(OutDir)TortoiseStub.pdb - Windows - true - true - true - 0x5940000 - - ..\..\obj\TortoiseStub\Release64\TortoiseStub.lib - MachineX64 - - - true - .\Release\TortoiseStub.bsc - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + TortoiseGitStub + {DB98402B-2CF6-4EC6-89F9-D19365EE8DE3} + TortoiseStub + + + + DynamicLibrary + v110_xp + Unicode + true + + + DynamicLibrary + v110_xp + Unicode + + + DynamicLibrary + v110_xp + Unicode + true + + + DynamicLibrary + v110_xp + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + + + $(ProjectName)32 + + + $(ProjectName)32 + + + + ..\Utils;%(AdditionalIncludeDirectories) + TORTOISESTUB_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + NotUsing + + + TortoiseStub.def + 0x5940000 + + + + + ..\Utils;%(AdditionalIncludeDirectories) + TORTOISESTUB_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + NotUsing + + + TortoiseStub.def + 0x5940000 + + + + + ..\Utils;%(AdditionalIncludeDirectories) + TORTOISESTUB_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + + + TortoiseStub.def + 0x5940000 + + + + + ..\Utils;%(AdditionalIncludeDirectories) + TORTOISESTUB_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + + + TortoiseStub.def + 0x5940000 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcxproj b/src/TortoiseUDiff/TortoiseUDiff.vcxproj index 80468b07e..91dec30fd 100644 --- a/src/TortoiseUDiff/TortoiseUDiff.vcxproj +++ b/src/TortoiseUDiff/TortoiseUDiff.vcxproj @@ -52,136 +52,52 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseUDiff\$(Configuration)\ - true - - - ..\..\bin\Debug64\bin\ - ..\..\obj\TortoiseUDiff\Debug64\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\TortoiseUDiff\$(Configuration)\ - false - - - ..\..\bin\Release64\bin\ - ..\..\obj\TortoiseUDiff\Release64\ - false + <_ProjectFileVersion>10.0.30319.1 - Disabled ..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level4 - EditAndContinue - - true - Windows - false - - MachineX86 - ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - X64 - - Disabled ..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level4 - ProgramDatabase - - true - Windows - false - - MachineX64 - ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - true ..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level4 - ProgramDatabase - - true - Windows - true - true - true - MachineX86 - ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) - - X64 - - true ..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level4 - ProgramDatabase - - true - Windows - true - true - true - MachineX64 - ..\DeclareDPIAware.manifest;%(AdditionalManifestFiles) @@ -194,10 +110,7 @@ - Create - Create - Create - Create + Create diff --git a/src/Utils/Utils.vcxproj b/src/Utils/Utils.vcxproj index 4da86bada..461181bb0 100644 --- a/src/Utils/Utils.vcxproj +++ b/src/Utils/Utils.vcxproj @@ -35,7 +35,6 @@ StaticLibrary v110_xp Dynamic - false Unicode @@ -49,7 +48,6 @@ StaticLibrary v110_xp Dynamic - false Unicode @@ -57,108 +55,57 @@ + + + + + + + + - <_ProjectFileVersion>11.0.51106.1 - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\Utils\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\Utils\$(Configuration)64\ - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\Utils\$(Configuration)\ - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\Utils\$(Configuration)64\ + <_ProjectFileVersion>10.0.30319.1 - Disabled ..\..\ext\gitdll;..\git;..\;..\ext\scintilla\include;..\ext\hunspell;.\;.\MiscUi;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - X64 - - Disabled ..\..\ext\gitdll;..\git;..\;..\ext\scintilla\include;..\ext\hunspell;.\;.\MiscUi;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false ..\..\ext\gitdll;..\git;..\;..\ext\scintilla\include;..\ext\hunspell;.\;.\MiscUi;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - X64 - - true - false ..\..\ext\gitdll;..\git;..\;..\ext\scintilla\include;..\ext\hunspell;.\;.\MiscUi;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - - - - - - + NotUsing @@ -166,14 +113,7 @@ - - - - - - - - + NotUsing @@ -193,10 +133,7 @@ - Create - Create - Create - Create + Create diff --git a/src/touch/touch.vcxproj b/src/touch/touch.vcxproj index 96f69c20d..0e54eb460 100644 --- a/src/touch/touch.vcxproj +++ b/src/touch/touch.vcxproj @@ -51,126 +51,37 @@ + + + + - <_ProjectFileVersion>11.0.51106.1 + <_ProjectFileVersion>10.0.30319.1 - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\touch\$(Configuration)\ - true - - - ..\..\bin\$(Configuration)\bin\ - ..\..\obj\touch\$(Configuration)\ - false - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\touch\$(Configuration)64\ - true - - - ..\..\bin\$(Configuration)64\bin\ - ..\..\obj\touch\$(Configuration)64\ - false - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - - - true - Windows - MachineX86 - - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - true - Windows - true - true - true - MachineX86 - - - - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - true - Windows - MachineX64 + false - - X64 - - - MaxSpeed - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - true - Windows - true - true - true - MachineX64 + false - Create - Create - Create - Create + Create -- 2.11.4.GIT