X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=FFFTP_English.vcproj;h=71fd353684c74d1b10cd85f42298927d323b126f;hb=refs%2Fheads%2Ftest;hp=40788d2a5159e736130aca1a487274f1baf30249;hpb=b0819c6bb0f6e5d74c98be2d978481effaa970f7;p=ffftp%2Fffftp.git

diff --git a/FFFTP_English.vcproj b/FFFTP_English.vcproj
index 40788d2..71fd353 100644
--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -28,6 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="utf8msg.exe src\mesg-eng.h src\mesg-eng.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -50,7 +51,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -74,12 +75,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib uuid.lib winmm.lib wintrust.lib winhttp.lib ws2_32.lib"
 				OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateManifest="false"
-				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"
+				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;oleaut32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;winhttp.dll;ws2_32.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\FFFTP_Eng_Debug\FFFTP.pdb"
 				SubSystem="2"
@@ -111,9 +112,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\FFFTP_Eng_Release"
-			IntermediateDirectory=".\FFFTP_Eng_Release"
+			Name="Debug|x64"
+			OutputDirectory=".\FFFTP_Eng_Debug_64"
+			IntermediateDirectory=".\FFFTP_Eng_Debug_64"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -121,6 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="utf8msg.exe src\mesg-eng.h src\mesg-eng.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -133,33 +135,33 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
+				TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
-				AssemblerListingLocation=".\FFFTP_Eng_Release\"
-				ObjectFile=".\FFFTP_Eng_Release\"
-				ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
+				AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
+				ObjectFile=".\FFFTP_Eng_Debug_64\"
+				ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -167,15 +169,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
-				OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
-				LinkIncremental="1"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib uuid.lib winmm.lib wintrust.lib winhttp.lib ws2_32.lib"
+				OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateManifest="false"
-				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"
-				ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
+				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;oleaut32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;winhttp.dll;ws2_32.dll"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
 				SubSystem="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -203,9 +206,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\FFFTP_Eng_Debug_64"
-			IntermediateDirectory=".\FFFTP_Eng_Debug_64"
+			Name="Release|Win32"
+			OutputDirectory=".\FFFTP_Eng_Release"
+			IntermediateDirectory=".\FFFTP_Eng_Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -213,6 +216,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="utf8msg.exe src\mesg-eng.h src\mesg-eng.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -225,33 +229,33 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
+				TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
-				AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
-				ObjectFile=".\FFFTP_Eng_Debug_64\"
-				ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
+				AssemblerListingLocation=".\FFFTP_Eng_Release\"
+				ObjectFile=".\FFFTP_Eng_Release\"
+				ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -259,16 +263,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
-				OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
-				LinkIncremental="2"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib uuid.lib winmm.lib wintrust.lib winhttp.lib ws2_32.lib"
+				OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateManifest="false"
-				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
+				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;oleaut32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;winhttp.dll;ws2_32.dll"
+				ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
 				SubSystem="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -306,6 +309,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="utf8msg.exe src\mesg-eng.h src\mesg-eng.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -328,7 +332,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
+				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -352,12 +356,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib uuid.lib winmm.lib wintrust.lib winhttp.lib ws2_32.lib"
 				OutputFile=".\FFFTP_Eng_Release_64\FFFTP.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateManifest="false"
-				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;ole32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;wsock32.dll"
+				DelayLoadDLLs="advapi32.dll;comctl32.dll;crypt32.dll;comdlg32.dll;gdi32.dll;imagehlp.dll;ole32.dll;oleaut32.dll;sfc.dll;shell32.dll;user32.dll;winmm.dll;wintrust.dll;winhttp.dll;ws2_32.dll"
 				ProgramDatabaseFile=".\FFFTP_Eng_Release_64\FFFTP.pdb"
 				SubSystem="2"
 				TargetMachine="17"
@@ -396,171 +400,179 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath=".\aes_modes.c"
+				RelativePath=".\src\aes_modes.c"
 				>
 			</File>
 			<File
-				RelativePath=".\aescrypt.c"
+				RelativePath=".\src\aescrypt.c"
 				>
 			</File>
 			<File
-				RelativePath=".\aeskey.c"
+				RelativePath=".\src\aeskey.c"
 				>
 			</File>
 			<File
-				RelativePath=".\aestab.c"
+				RelativePath=".\src\aestab.c"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark.c"
+				RelativePath=".\src\apiemulator.c"
 				>
 			</File>
 			<File
-				RelativePath=".\cache.c"
+				RelativePath=".\src\bookmark.c"
 				>
 			</File>
 			<File
-				RelativePath=".\clipboard.c"
+				RelativePath=".\src\cache.c"
 				>
 			</File>
 			<File
-				RelativePath=".\codecnv.c"
+				RelativePath=".\src\clipboard.c"
 				>
 			</File>
 			<File
-				RelativePath=".\connect.c"
+				RelativePath=".\src\codecnv.c"
 				>
 			</File>
 			<File
-				RelativePath=".\diskfree.c"
+				RelativePath=".\src\connect.c"
 				>
 			</File>
 			<File
-				RelativePath=".\dlgsize.c"
+				RelativePath=".\src\diskfree.c"
 				>
 			</File>
 			<File
-				RelativePath=".\Resource_eng\FFFTP-eng.rc"
+				RelativePath=".\src\dlgsize.c"
 				>
 			</File>
 			<File
-				RelativePath=".\filelist.c"
+				RelativePath=".\Resource_eng\ffftp.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\ftpproc.c"
+				RelativePath=".\src\filelist.c"
 				>
 			</File>
 			<File
-				RelativePath=".\getput.c"
+				RelativePath=".\src\ftpproc.c"
 				>
 			</File>
 			<File
-				RelativePath=".\history.c"
+				RelativePath=".\src\getput.c"
 				>
 			</File>
 			<File
-				RelativePath=".\hostman.c"
+				RelativePath=".\src\history.c"
 				>
 			</File>
 			<File
-				RelativePath=".\local.c"
+				RelativePath=".\src\hostman.c"
 				>
 			</File>
 			<File
-				RelativePath=".\lvtips.c"
+				RelativePath=".\src\local.c"
 				>
 			</File>
 			<File
-				RelativePath=".\main.c"
+				RelativePath=".\src\lvtips.c"
 				>
 			</File>
 			<File
-				RelativePath=".\mbswrapper.c"
+				RelativePath=".\src\main.c"
 				>
 			</File>
 			<File
-				RelativePath=".\md4.c"
+				RelativePath=".\src\mbswrapper.c"
 				>
 			</File>
 			<File
-				RelativePath=".\md5.c"
+				RelativePath=".\src\md4.c"
 				>
 			</File>
 			<File
-				RelativePath=".\misc.c"
+				RelativePath=".\src\md5.c"
 				>
 			</File>
 			<File
-				RelativePath=".\OleDragDrop.c"
+				RelativePath=".\src\misc.c"
 				>
 			</File>
 			<File
-				RelativePath=".\option.c"
+				RelativePath=".\src\OleDragDrop.c"
 				>
 			</File>
 			<File
-				RelativePath=".\protectprocess.c"
+				RelativePath=".\src\option.c"
 				>
 			</File>
 			<File
-				RelativePath=".\punycode.c"
+				RelativePath=".\src\protectprocess.c"
 				>
 			</File>
 			<File
-				RelativePath=".\ras.c"
+				RelativePath=".\src\punycode.c"
 				>
 			</File>
 			<File
-				RelativePath=".\regexp.c"
+				RelativePath=".\src\ras.c"
 				>
 			</File>
 			<File
-				RelativePath=".\registry.c"
+				RelativePath=".\src\regexp.c"
 				>
 			</File>
 			<File
-				RelativePath=".\remote.c"
+				RelativePath=".\src\registry.c"
 				>
 			</File>
 			<File
-				RelativePath=".\sha.c"
+				RelativePath=".\src\remote.c"
 				>
 			</File>
 			<File
-				RelativePath=".\skey.c"
+				RelativePath=".\src\sha.c"
 				>
 			</File>
 			<File
-				RelativePath=".\socket.c"
+				RelativePath=".\src\skey.c"
 				>
 			</File>
 			<File
-				RelativePath=".\socketwrapper.c"
+				RelativePath=".\src\socket.c"
 				>
 			</File>
 			<File
-				RelativePath=".\statuswin.c"
+				RelativePath=".\src\socketwrapper.c"
 				>
 			</File>
 			<File
-				RelativePath=".\taskwin.c"
+				RelativePath=".\src\statuswin.c"
 				>
 			</File>
 			<File
-				RelativePath=".\tool.c"
+				RelativePath=".\src\taskwin.c"
 				>
 			</File>
 			<File
-				RelativePath=".\toolmenu.c"
+				RelativePath=".\src\tool.c"
 				>
 			</File>
 			<File
-				RelativePath=".\updatebell.c"
+				RelativePath=".\src\toolmenu.c"
 				>
 			</File>
 			<File
-				RelativePath=".\wildcard.c"
+				RelativePath=".\src\updatebell.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\updater.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\wildcard.c"
 				>
 			</File>
 		</Filter>
@@ -569,15 +581,19 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath=".\common.h"
+				RelativePath=".\src\apiemulator.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\common.h"
 				>
 			</File>
 			<File
-				RelativePath=".\mbswrapper.h"
+				RelativePath=".\src\mbswrapper.h"
 				>
 			</File>
 			<File
-				RelativePath=".\protectprocess.h"
+				RelativePath=".\src\protectprocess.h"
 				>
 			</File>
 			<File
@@ -585,7 +601,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\socketwrapper.h"
+				RelativePath=".\src\socketwrapper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\updater.h"
 				>
 			</File>
 		</Filter>