Prepare for release of 1.98f.

[ffftp/ffftp.git] / FFFTP.vcproj

diff --git a/FFFTP.vcproj b/FFFTP.vcproj
index 503a503..a087916 100644 (file)
--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -4,19 +4,116 @@
        Version="8.00"\r
        Name="FFFTP"\r
        ProjectGUID="{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"\r
        Version="8.00"\r
        Name="FFFTP"\r
        ProjectGUID="{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"\r

+       RootNamespace="FFFTP"\r

        >\r
        <Platforms>\r
                <Platform\r
                        Name="Win32"\r
                />\r
        >\r
        <Platforms>\r
                <Platform\r
                        Name="Win32"\r
                />\r

+               <Platform\r
+                       Name="x64"\r
+               />\r

        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r

-                       OutputDirectory="."\r
-                       IntermediateDirectory=".\debug"\r
+                       OutputDirectory=".\Debug"\r
+                       IntermediateDirectory=".\Debug"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="utf8msg.exe mesg-jpn.h mesg-jpn.h"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Debug\FFFTP.tlb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Debug\"\r
+                               ObjectFile=".\Debug\"\r
+                               ProgramDataBaseFileName=".\Debug\"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1041"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib ws2_32.lib"\r
+                               OutputFile=".\Debug\FFFTP.exe"\r
+                               LinkIncremental="2"\r
+                               SuppressStartupBanner="true"\r
+                               GenerateManifest="false"\r
+                               DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;ws2_32.dll"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile=".\Debug\FFFTP.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory=".\Debug_64"\r
+                       IntermediateDirectory=".\Debug_64"\r

                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        UseOfMFC="0"\r


@@ -24,6 +121,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r

+                               CommandLine="utf8msg.exe mesg-jpn.h mesg-jpn.h"\r

                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r


@@ -40,18 +138,18 @@
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r

-                               TypeLibraryName="./FFFTP.tlb"\r
+                               TypeLibraryName=".\Debug_64\FFFTP.tlb"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="Resource"\r
-                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
+                               PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r

                                RuntimeLibrary="1"\r
                                RuntimeLibrary="1"\r

-                               PrecompiledHeaderFile=".\debug/FFFTP.pch"\r
-                               AssemblerListingLocation=".\debug/"\r
-                               ObjectFile=".\debug/"\r
-                               ProgramDataBaseFileName=".\debug/"\r
+                               PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Debug_64\"\r
+                               ObjectFile=".\Debug_64\"\r
+                               ProgramDataBaseFileName=".\Debug_64\"\r

                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r


@@ -69,14 +167,16 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib htmlhelp.lib"\r
-                               OutputFile="./FFFTP.exe"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib ws2_32.lib"\r
+                               OutputFile=".\Debug_64\FFFTP.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r

+                               GenerateManifest="false"\r
+                               DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;ws2_32.dll"\r

                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="./FFFTP.pdb"\r
+                               ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"\r

                                SubSystem="2"\r
                                SubSystem="2"\r

+                               TargetMachine="17"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -105,7 +205,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r

-                       OutputDirectory="."\r
+                       OutputDirectory=".\Release"\r

                        IntermediateDirectory=".\Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
                        IntermediateDirectory=".\Release"\r
                        ConfigurationType="1"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r


@@ -114,6 +214,101 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r

+                               CommandLine="utf8msg.exe mesg-jpn.h mesg-jpn.h"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Release\FFFTP.tlb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               InlineFunctionExpansion="1"\r
+                               AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Release\"\r
+                               ObjectFile=".\Release\"\r
+                               ProgramDataBaseFileName=".\Release\"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1041"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib ws2_32.lib"\r
+                               OutputFile=".\Release\FFFTP.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               GenerateManifest="false"\r
+                               DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;ws2_32.dll"\r
+                               ProgramDatabaseFile=".\Release\FFFTP.pdb"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory=".\Release_64"\r
+                       IntermediateDirectory=".\Release_64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="utf8msg.exe mesg-jpn.h mesg-jpn.h"\r

                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r


@@ -130,20 +325,20 @@
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
                                TargetEnvironment="1"\r

-                               TypeLibraryName="./FFFTP.tlb"\r
+                               TypeLibraryName=".\Release_64\FFFTP.tlb"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r

-                               AdditionalIncludeDirectories="Resource"\r
-                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_WIN32_IE=0x300,_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="Resource;contrib\openssl\include"\r
+                               PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"\r

                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

-                               PrecompiledHeaderFile=".\Release/FFFTP.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile=".\Release_64\FFFTP.pch"\r
+                               AssemblerListingLocation=".\Release_64\"\r
+                               ObjectFile=".\Release_64\"\r
+                               ProgramDataBaseFileName=".\Release_64\"\r

                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="0"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="0"\r


@@ -161,14 +356,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="wsock32.lib comctl32.lib winmm.lib RASAPI32.LIB htmlhelp.lib"\r
-                               OutputFile="./FFFTP.exe"\r
+                               AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib ws2_32.lib"\r
+                               OutputFile=".\Release_64\FFFTP.exe"\r

                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r

-                               GenerateDebugInformation="false"\r
-                               ProgramDatabaseFile="./FFFTP.pdb"\r
+                               GenerateManifest="false"\r
+                               DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;ws2_32.dll"\r
+                               ProgramDatabaseFile=".\Release_64\FFFTP.pdb"\r

                                SubSystem="2"\r
                                SubSystem="2"\r

+                               TargetMachine="17"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -284,6 +480,10 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\mbswrapper.c"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\md4.c"\r
                                >\r
                        </File>\r
                                RelativePath=".\md4.c"\r
                                >\r
                        </File>\r


@@ -304,6 +504,14 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\protectprocess.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\punycode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\ras.c"\r
                                >\r
                        </File>\r
                                RelativePath=".\ras.c"\r
                                >\r
                        </File>\r


@@ -312,7 +520,7 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\registory.c"\r
+                               RelativePath=".\registry.c"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -332,6 +540,10 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\socketwrapper.c"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\statuswin.c"\r
                                >\r
                        </File>\r
                                RelativePath=".\statuswin.c"\r
                                >\r
                        </File>\r


@@ -365,9 +577,21 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\mbswrapper.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\protectprocess.h"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\Resource\resource.h"\r
                                >\r
                        </File>\r
                                RelativePath=".\Resource\resource.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\socketwrapper.h"\r
+                               >\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r


@@ -390,10 +614,6 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\Resource\ico00001.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r

                                RelativePath=".\Resource\icon1.ico"\r
                                >\r
                        </File>\r
                                RelativePath=".\Resource\icon1.ico"\r
                                >\r
                        </File>\r


@@ -436,6 +656,21 @@
                                        Name="VCCustomBuildTool"\r
                                />\r
                        </FileConfiguration>\r
                                        Name="VCCustomBuildTool"\r
                                />\r
                        </FileConfiguration>\r

+                       <FileConfiguration\r
+                               Name="Debug|x64"\r
+                               ExcludedFromBuild="true"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|x64"\r
+                               >\r
+                               <Tool\r
+                                       Name="VCCustomBuildTool"\r
+                               />\r
+                       </FileConfiguration>\r

                </File>\r
        </Files>\r
        <Globals>\r
                </File>\r
        </Files>\r
        <Globals>\r