OSDN > 開発者 >

amalsyah1 > 作業部屋 > ffftp > コミット

amalsyah1

Fork

Fork元: ffftp / ffftp

R/O
HTTP
SSH
HTTPS

コミット

コミットメタ情報

リビジョン	1c6203ce6ace264b85ef9b677f75ecad9fb7c862 (tree)
日時	2012-02-09 10:35:46
作者	s_kawamoto <s_kawamoto@user...>
コミッター	s_kawamoto

ログメッセージ

Fix project files.

変更サマリ

modified: FFFTP.vc80ee.vcproj (diff)
modified: FFFTP.vcproj (diff)
modified: FFFTP_Eng_Release/FFFTP.exe (diff)
modified: FFFTP_English.vc80ee.vcproj (diff)
modified: FFFTP_English.vc90.vcproj (diff)
modified: FFFTP_English.vcproj (diff)
modified: Release/FFFTP.exe (diff)
modified: common.h (diff)
modified: putty/PuTTY.vcproj (diff)
modified: toolmenu.c (diff)

差分

--- a/FFFTP.vc80ee.vcproj

+++ b/FFFTP.vc80ee.vcproj

		@@ -111,9 +111,9 @@
111	111	/>
112	112	</Configuration>
113	113	<Configuration
114		- Name="Release\|Win32"
115		- OutputDirectory=".\Release"
116		- IntermediateDirectory=".\Release"
	114	+ Name="Debug\|x64"
	115	+ OutputDirectory=".\Debug_64"
	116	+ IntermediateDirectory=".\Debug_64"
117	117	ConfigurationType="1"
118	118	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
119	119	UseOfMFC="0"

		@@ -134,34 +134,32 @@
134	134	/>
135	135	<Tool
136	136	Name="VCMIDLTool"
137		- PreprocessorDefinitions="NDEBUG"
	137	+ PreprocessorDefinitions="_DEBUG"
138	138	MkTypLibCompatible="true"
139	139	SuppressStartupBanner="true"
140	140	TargetEnvironment="1"
141		- TypeLibraryName=".\Release\FFFTP.tlb"
	141	+ TypeLibraryName=".\Debug_64\FFFTP.tlb"
142	142	/>
143	143	<Tool
144	144	Name="VCCLCompilerTool"
145		- InlineFunctionExpansion="1"
	145	+ Optimization="0"
146	146	AdditionalIncludeDirectories="Resource;contrib\openssl\include"
147		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
148		- StringPooling="true"
149		- RuntimeLibrary="0"
150		- EnableFunctionLevelLinking="true"
151		- PrecompiledHeaderFile=".\Release\FFFTP.pch"
152		- AssemblerListingLocation=".\Release\"
153		- ObjectFile=".\Release\"
154		- ProgramDataBaseFileName=".\Release\"
	147	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
	148	+ RuntimeLibrary="1"
	149	+ PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"
	150	+ AssemblerListingLocation=".\Debug_64\"
	151	+ ObjectFile=".\Debug_64\"
	152	+ ProgramDataBaseFileName=".\Debug_64\"
155	153	WarningLevel="3"
156	154	SuppressStartupBanner="true"
157		- DebugInformationFormat="0"
	155	+ DebugInformationFormat="4"
158	156	/>
159	157	<Tool
160	158	Name="VCManagedResourceCompilerTool"
161	159	/>
162	160	<Tool
163	161	Name="VCResourceCompilerTool"
164		- PreprocessorDefinitions="NDEBUG"
	162	+ PreprocessorDefinitions="_DEBUG"
165	163	Culture="1041"
166	164	/>
167	165	<Tool

		@@ -169,15 +167,16 @@
169	167	/>
170	168	<Tool
171	169	Name="VCLinkerTool"
172		- AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
173		- OutputFile=".\Release\FFFTP.exe"
174		- LinkIncremental="1"
	170	+ AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
	171	+ OutputFile=".\Debug_64\FFFTP.exe"
	172	+ LinkIncremental="2"
175	173	SuppressStartupBanner="true"
176	174	GenerateManifest="false"
177	175	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"
178		- ProgramDatabaseFile=".\Release\FFFTP.pdb"
	176	+ GenerateDebugInformation="true"
	177	+ ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"
179	178	SubSystem="2"
180		- TargetMachine="1"
	179	+ TargetMachine="17"
181	180	/>
182	181	<Tool
183	182	Name="VCALinkTool"

		@@ -205,9 +204,9 @@
205	204	/>
206	205	</Configuration>
207	206	<Configuration
208		- Name="Debug\|x64"
209		- OutputDirectory=".\Debug_64"
210		- IntermediateDirectory=".\Debug_64"
	207	+ Name="Release\|Win32"
	208	+ OutputDirectory=".\Release"
	209	+ IntermediateDirectory=".\Release"
211	210	ConfigurationType="1"
212	211	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213	212	UseOfMFC="0"

		@@ -228,32 +227,34 @@
228	227	/>
229	228	<Tool
230	229	Name="VCMIDLTool"
231		- PreprocessorDefinitions="_DEBUG"
	230	+ PreprocessorDefinitions="NDEBUG"
232	231	MkTypLibCompatible="true"
233	232	SuppressStartupBanner="true"
234	233	TargetEnvironment="1"
235		- TypeLibraryName=".\Debug_64\FFFTP.tlb"
	234	+ TypeLibraryName=".\Release\FFFTP.tlb"
236	235	/>
237	236	<Tool
238	237	Name="VCCLCompilerTool"
239		- Optimization="0"
	238	+ InlineFunctionExpansion="1"
240	239	AdditionalIncludeDirectories="Resource;contrib\openssl\include"
241		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
242		- RuntimeLibrary="1"
243		- PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"
244		- AssemblerListingLocation=".\Debug_64\"
245		- ObjectFile=".\Debug_64\"
246		- ProgramDataBaseFileName=".\Debug_64\"
	240	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
	241	+ StringPooling="true"
	242	+ RuntimeLibrary="0"
	243	+ EnableFunctionLevelLinking="true"
	244	+ PrecompiledHeaderFile=".\Release\FFFTP.pch"
	245	+ AssemblerListingLocation=".\Release\"
	246	+ ObjectFile=".\Release\"
	247	+ ProgramDataBaseFileName=".\Release\"
247	248	WarningLevel="3"
248	249	SuppressStartupBanner="true"
249		- DebugInformationFormat="4"
	250	+ DebugInformationFormat="0"
250	251	/>
251	252	<Tool
252	253	Name="VCManagedResourceCompilerTool"
253	254	/>
254	255	<Tool
255	256	Name="VCResourceCompilerTool"
256		- PreprocessorDefinitions="_DEBUG"
	257	+ PreprocessorDefinitions="NDEBUG"
257	258	Culture="1041"
258	259	/>
259	260	<Tool

		@@ -261,16 +262,15 @@
261	262	/>
262	263	<Tool
263	264	Name="VCLinkerTool"
264		- AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
265		- OutputFile=".\Debug_64\FFFTP.exe"
266		- LinkIncremental="2"
	265	+ AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
	266	+ OutputFile=".\Release\FFFTP.exe"
	267	+ LinkIncremental="1"
267	268	SuppressStartupBanner="true"
268	269	GenerateManifest="false"
269	270	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"
270		- GenerateDebugInformation="true"
271		- ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"
	271	+ ProgramDatabaseFile=".\Release\FFFTP.pdb"
272	272	SubSystem="2"
273		- TargetMachine="17"
	273	+ TargetMachine="1"
274	274	/>
275	275	<Tool
276	276	Name="VCALinkTool"

--- a/FFFTP.vcproj

+++ b/FFFTP.vcproj

		@@ -111,9 +111,9 @@
111	111	/>
112	112	</Configuration>
113	113	<Configuration
114		- Name="Release\|Win32"
115		- OutputDirectory=".\Release"
116		- IntermediateDirectory=".\Release"
	114	+ Name="Debug\|x64"
	115	+ OutputDirectory=".\Debug_64"
	116	+ IntermediateDirectory=".\Debug_64"
117	117	ConfigurationType="1"
118	118	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
119	119	UseOfMFC="0"

		@@ -134,34 +134,32 @@
134	134	/>
135	135	<Tool
136	136	Name="VCMIDLTool"
137		- PreprocessorDefinitions="NDEBUG"
	137	+ PreprocessorDefinitions="_DEBUG"
138	138	MkTypLibCompatible="true"
139	139	SuppressStartupBanner="true"
140	140	TargetEnvironment="1"
141		- TypeLibraryName=".\Release\FFFTP.tlb"
	141	+ TypeLibraryName=".\Debug_64\FFFTP.tlb"
142	142	/>
143	143	<Tool
144	144	Name="VCCLCompilerTool"
145		- InlineFunctionExpansion="1"
	145	+ Optimization="0"
146	146	AdditionalIncludeDirectories="Resource;contrib\openssl\include"
147		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
148		- StringPooling="true"
149		- RuntimeLibrary="0"
150		- EnableFunctionLevelLinking="true"
151		- PrecompiledHeaderFile=".\Release\FFFTP.pch"
152		- AssemblerListingLocation=".\Release\"
153		- ObjectFile=".\Release\"
154		- ProgramDataBaseFileName=".\Release\"
	147	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
	148	+ RuntimeLibrary="1"
	149	+ PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"
	150	+ AssemblerListingLocation=".\Debug_64\"
	151	+ ObjectFile=".\Debug_64\"
	152	+ ProgramDataBaseFileName=".\Debug_64\"
155	153	WarningLevel="3"
156	154	SuppressStartupBanner="true"
157		- DebugInformationFormat="0"
	155	+ DebugInformationFormat="4"
158	156	/>
159	157	<Tool
160	158	Name="VCManagedResourceCompilerTool"
161	159	/>
162	160	<Tool
163	161	Name="VCResourceCompilerTool"
164		- PreprocessorDefinitions="NDEBUG"
	162	+ PreprocessorDefinitions="_DEBUG"
165	163	Culture="1041"
166	164	/>
167	165	<Tool

		@@ -170,14 +168,15 @@
170	168	<Tool
171	169	Name="VCLinkerTool"
172	170	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
173		- OutputFile=".\Release\FFFTP.exe"
174		- LinkIncremental="1"
	171	+ OutputFile=".\Debug_64\FFFTP.exe"
	172	+ LinkIncremental="2"
175	173	SuppressStartupBanner="true"
176	174	GenerateManifest="false"
177	175	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"
178		- ProgramDatabaseFile=".\Release\FFFTP.pdb"
	176	+ GenerateDebugInformation="true"
	177	+ ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"
179	178	SubSystem="2"
180		- TargetMachine="1"
	179	+ TargetMachine="17"
181	180	/>
182	181	<Tool
183	182	Name="VCALinkTool"

		@@ -205,9 +204,9 @@
205	204	/>
206	205	</Configuration>
207	206	<Configuration
208		- Name="Debug\|x64"
209		- OutputDirectory=".\Debug_64"
210		- IntermediateDirectory=".\Debug_64"
	207	+ Name="Release\|Win32"
	208	+ OutputDirectory=".\Release"
	209	+ IntermediateDirectory=".\Release"
211	210	ConfigurationType="1"
212	211	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213	212	UseOfMFC="0"

		@@ -228,32 +227,34 @@
228	227	/>
229	228	<Tool
230	229	Name="VCMIDLTool"
231		- PreprocessorDefinitions="_DEBUG"
	230	+ PreprocessorDefinitions="NDEBUG"
232	231	MkTypLibCompatible="true"
233	232	SuppressStartupBanner="true"
234	233	TargetEnvironment="1"
235		- TypeLibraryName=".\Debug_64\FFFTP.tlb"
	234	+ TypeLibraryName=".\Release\FFFTP.tlb"
236	235	/>
237	236	<Tool
238	237	Name="VCCLCompilerTool"
239		- Optimization="0"
	238	+ InlineFunctionExpansion="1"
240	239	AdditionalIncludeDirectories="Resource;contrib\openssl\include"
241		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
242		- RuntimeLibrary="1"
243		- PrecompiledHeaderFile=".\Debug_64\FFFTP.pch"
244		- AssemblerListingLocation=".\Debug_64\"
245		- ObjectFile=".\Debug_64\"
246		- ProgramDataBaseFileName=".\Debug_64\"
	240	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS"
	241	+ StringPooling="true"
	242	+ RuntimeLibrary="0"
	243	+ EnableFunctionLevelLinking="true"
	244	+ PrecompiledHeaderFile=".\Release\FFFTP.pch"
	245	+ AssemblerListingLocation=".\Release\"
	246	+ ObjectFile=".\Release\"
	247	+ ProgramDataBaseFileName=".\Release\"
247	248	WarningLevel="3"
248	249	SuppressStartupBanner="true"
249		- DebugInformationFormat="4"
	250	+ DebugInformationFormat="0"
250	251	/>
251	252	<Tool
252	253	Name="VCManagedResourceCompilerTool"
253	254	/>
254	255	<Tool
255	256	Name="VCResourceCompilerTool"
256		- PreprocessorDefinitions="_DEBUG"
	257	+ PreprocessorDefinitions="NDEBUG"
257	258	Culture="1041"
258	259	/>
259	260	<Tool

		@@ -262,15 +263,14 @@
262	263	<Tool
263	264	Name="VCLinkerTool"
264	265	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
265		- OutputFile=".\Debug_64\FFFTP.exe"
266		- LinkIncremental="2"
	266	+ OutputFile=".\Release\FFFTP.exe"
	267	+ LinkIncremental="1"
267	268	SuppressStartupBanner="true"
268	269	GenerateManifest="false"
269	270	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"
270		- GenerateDebugInformation="true"
271		- ProgramDatabaseFile=".\Debug_64\FFFTP.pdb"
	271	+ ProgramDatabaseFile=".\Release\FFFTP.pdb"
272	272	SubSystem="2"
273		- TargetMachine="17"
	273	+ TargetMachine="1"
274	274	/>
275	275	<Tool
276	276	Name="VCALinkTool"

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

--- a/FFFTP_English.vc80ee.vcproj

+++ b/FFFTP_English.vc80ee.vcproj

		@@ -51,7 +51,7 @@
51	51	Name="VCCLCompilerTool"
52	52	Optimization="0"
53	53	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
54		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	54	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
55	55	BasicRuntimeChecks="3"
56	56	RuntimeLibrary="1"
57	57	PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"

		@@ -112,9 +112,9 @@
112	112	/>
113	113	</Configuration>
114	114	<Configuration
115		- Name="Release\|Win32"
116		- OutputDirectory=".\FFFTP_Eng_Release"
117		- IntermediateDirectory=".\FFFTP_Eng_Release"
	115	+ Name="Debug\|x64"
	116	+ OutputDirectory=".\FFFTP_Eng_Debug_64"
	117	+ IntermediateDirectory=".\FFFTP_Eng_Debug_64"
118	118	ConfigurationType="1"
119	119	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120	120	UseOfMFC="0"

		@@ -135,33 +135,33 @@
135	135	/>
136	136	<Tool
137	137	Name="VCMIDLTool"
138		- PreprocessorDefinitions="NDEBUG"
	138	+ PreprocessorDefinitions="_DEBUG"
139	139	MkTypLibCompatible="true"
140	140	SuppressStartupBanner="true"
141	141	TargetEnvironment="1"
142		- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
	142	+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143	143	/>
144	144	<Tool
145	145	Name="VCCLCompilerTool"
146		- InlineFunctionExpansion="1"
	146	+ Optimization="0"
147	147	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
148		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
149		- StringPooling="true"
150		- RuntimeLibrary="0"
151		- EnableFunctionLevelLinking="true"
152		- PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
153		- AssemblerListingLocation=".\FFFTP_Eng_Release\"
154		- ObjectFile=".\FFFTP_Eng_Release\"
155		- ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
	148	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	149	+ BasicRuntimeChecks="3"
	150	+ RuntimeLibrary="1"
	151	+ PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
	152	+ AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
	153	+ ObjectFile=".\FFFTP_Eng_Debug_64\"
	154	+ ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
156	155	WarningLevel="3"
157	156	SuppressStartupBanner="true"
	157	+ DebugInformationFormat="4"
158	158	/>
159	159	<Tool
160	160	Name="VCManagedResourceCompilerTool"
161	161	/>
162	162	<Tool
163	163	Name="VCResourceCompilerTool"
164		- PreprocessorDefinitions="NDEBUG"
	164	+ PreprocessorDefinitions="_DEBUG"
165	165	Culture="1033"
166	166	/>
167	167	<Tool

		@@ -169,15 +169,16 @@
169	169	/>
170	170	<Tool
171	171	Name="VCLinkerTool"
172		- AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
173		- OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
174		- LinkIncremental="1"
	172	+ AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
	173	+ OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
	174	+ LinkIncremental="2"
175	175	SuppressStartupBanner="true"
176	176	GenerateManifest="false"
177	177	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"
178		- ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
	178	+ GenerateDebugInformation="true"
	179	+ ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
179	180	SubSystem="2"
180		- TargetMachine="1"
	181	+ TargetMachine="17"
181	182	/>
182	183	<Tool
183	184	Name="VCALinkTool"

		@@ -205,9 +206,9 @@
205	206	/>
206	207	</Configuration>
207	208	<Configuration
208		- Name="Debug\|x64"
209		- OutputDirectory=".\FFFTP_Eng_Debug_64"
210		- IntermediateDirectory=".\FFFTP_Eng_Debug_64"
	209	+ Name="Release\|Win32"
	210	+ OutputDirectory=".\FFFTP_Eng_Release"
	211	+ IntermediateDirectory=".\FFFTP_Eng_Release"
211	212	ConfigurationType="1"
212	213	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213	214	UseOfMFC="0"

		@@ -228,33 +229,33 @@
228	229	/>
229	230	<Tool
230	231	Name="VCMIDLTool"
231		- PreprocessorDefinitions="_DEBUG"
	232	+ PreprocessorDefinitions="NDEBUG"
232	233	MkTypLibCompatible="true"
233	234	SuppressStartupBanner="true"
234	235	TargetEnvironment="1"
235		- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
	236	+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
236	237	/>
237	238	<Tool
238	239	Name="VCCLCompilerTool"
239		- Optimization="0"
	240	+ InlineFunctionExpansion="1"
240	241	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
241		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
242		- BasicRuntimeChecks="3"
243		- RuntimeLibrary="1"
244		- PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
245		- AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
246		- ObjectFile=".\FFFTP_Eng_Debug_64\"
247		- ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
	242	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	243	+ StringPooling="true"
	244	+ RuntimeLibrary="0"
	245	+ EnableFunctionLevelLinking="true"
	246	+ PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
	247	+ AssemblerListingLocation=".\FFFTP_Eng_Release\"
	248	+ ObjectFile=".\FFFTP_Eng_Release\"
	249	+ ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
248	250	WarningLevel="3"
249	251	SuppressStartupBanner="true"
250		- DebugInformationFormat="4"
251	252	/>
252	253	<Tool
253	254	Name="VCManagedResourceCompilerTool"
254	255	/>
255	256	<Tool
256	257	Name="VCResourceCompilerTool"
257		- PreprocessorDefinitions="_DEBUG"
	258	+ PreprocessorDefinitions="NDEBUG"
258	259	Culture="1033"
259	260	/>
260	261	<Tool

		@@ -262,16 +263,15 @@
262	263	/>
263	264	<Tool
264	265	Name="VCLinkerTool"
265		- AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
266		- OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
267		- LinkIncremental="2"
	266	+ AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
	267	+ OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
	268	+ LinkIncremental="1"
268	269	SuppressStartupBanner="true"
269	270	GenerateManifest="false"
270	271	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"
271		- GenerateDebugInformation="true"
272		- ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
	272	+ ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
273	273	SubSystem="2"
274		- TargetMachine="17"
	274	+ TargetMachine="1"
275	275	/>
276	276	<Tool
277	277	Name="VCALinkTool"

		@@ -332,7 +332,7 @@
332	332	Name="VCCLCompilerTool"
333	333	InlineFunctionExpansion="1"
334	334	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
335		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	335	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
336	336	StringPooling="true"
337	337	RuntimeLibrary="0"
338	338	EnableFunctionLevelLinking="true"

--- a/FFFTP_English.vc90.vcproj

+++ b/FFFTP_English.vc90.vcproj

		@@ -52,7 +52,7 @@
52	52	Name="VCCLCompilerTool"
53	53	Optimization="0"
54	54	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
55		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	55	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
56	56	BasicRuntimeChecks="3"
57	57	RuntimeLibrary="1"
58	58	PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"

		@@ -112,9 +112,9 @@
112	112	/>
113	113	</Configuration>
114	114	<Configuration
115		- Name="Release\|Win32"
116		- OutputDirectory=".\FFFTP_Eng_Release"
117		- IntermediateDirectory=".\FFFTP_Eng_Release"
	115	+ Name="Debug\|x64"
	116	+ OutputDirectory=".\FFFTP_Eng_Debug_64"
	117	+ IntermediateDirectory=".\FFFTP_Eng_Debug_64"
118	118	ConfigurationType="1"
119	119	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120	120	UseOfMFC="0"

		@@ -135,33 +135,33 @@
135	135	/>
136	136	<Tool
137	137	Name="VCMIDLTool"
138		- PreprocessorDefinitions="NDEBUG"
	138	+ PreprocessorDefinitions="_DEBUG"
139	139	MkTypLibCompatible="true"
140	140	SuppressStartupBanner="true"
141	141	TargetEnvironment="1"
142		- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
	142	+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143	143	/>
144	144	<Tool
145	145	Name="VCCLCompilerTool"
146		- InlineFunctionExpansion="1"
	146	+ Optimization="0"
147	147	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
148		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
149		- StringPooling="true"
150		- RuntimeLibrary="0"
151		- EnableFunctionLevelLinking="true"
152		- PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
153		- AssemblerListingLocation=".\FFFTP_Eng_Release\"
154		- ObjectFile=".\FFFTP_Eng_Release\"
155		- ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
	148	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	149	+ BasicRuntimeChecks="3"
	150	+ RuntimeLibrary="1"
	151	+ PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
	152	+ AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
	153	+ ObjectFile=".\FFFTP_Eng_Debug_64\"
	154	+ ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
156	155	WarningLevel="3"
157	156	SuppressStartupBanner="true"
	157	+ DebugInformationFormat="4"
158	158	/>
159	159	<Tool
160	160	Name="VCManagedResourceCompilerTool"
161	161	/>
162	162	<Tool
163	163	Name="VCResourceCompilerTool"
164		- PreprocessorDefinitions="NDEBUG"
	164	+ PreprocessorDefinitions="_DEBUG"
165	165	Culture="1033"
166	166	/>
167	167	<Tool

		@@ -170,16 +170,17 @@
170	170	<Tool
171	171	Name="VCLinkerTool"
172	172	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
173		- OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
174		- LinkIncremental="1"
	173	+ OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
	174	+ LinkIncremental="2"
175	175	SuppressStartupBanner="true"
176	176	GenerateManifest="false"
177	177	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"
178		- ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
	178	+ GenerateDebugInformation="true"
	179	+ ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
179	180	SubSystem="2"
180	181	RandomizedBaseAddress="1"
181	182	DataExecutionPrevention="0"
182		- TargetMachine="1"
	183	+ TargetMachine="17"
183	184	/>
184	185	<Tool
185	186	Name="VCALinkTool"

		@@ -204,9 +205,9 @@
204	205	/>
205	206	</Configuration>
206	207	<Configuration
207		- Name="Debug\|x64"
208		- OutputDirectory=".\FFFTP_Eng_Debug_64"
209		- IntermediateDirectory=".\FFFTP_Eng_Debug_64"
	208	+ Name="Release\|Win32"
	209	+ OutputDirectory=".\FFFTP_Eng_Release"
	210	+ IntermediateDirectory=".\FFFTP_Eng_Release"
210	211	ConfigurationType="1"
211	212	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
212	213	UseOfMFC="0"

		@@ -227,33 +228,33 @@
227	228	/>
228	229	<Tool
229	230	Name="VCMIDLTool"
230		- PreprocessorDefinitions="_DEBUG"
	231	+ PreprocessorDefinitions="NDEBUG"
231	232	MkTypLibCompatible="true"
232	233	SuppressStartupBanner="true"
233	234	TargetEnvironment="1"
234		- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
	235	+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
235	236	/>
236	237	<Tool
237	238	Name="VCCLCompilerTool"
238		- Optimization="0"
	239	+ InlineFunctionExpansion="1"
239	240	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
240		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
241		- BasicRuntimeChecks="3"
242		- RuntimeLibrary="1"
243		- PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
244		- AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
245		- ObjectFile=".\FFFTP_Eng_Debug_64\"
246		- ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
	241	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	242	+ StringPooling="true"
	243	+ RuntimeLibrary="0"
	244	+ EnableFunctionLevelLinking="true"
	245	+ PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
	246	+ AssemblerListingLocation=".\FFFTP_Eng_Release\"
	247	+ ObjectFile=".\FFFTP_Eng_Release\"
	248	+ ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
247	249	WarningLevel="3"
248	250	SuppressStartupBanner="true"
249		- DebugInformationFormat="4"
250	251	/>
251	252	<Tool
252	253	Name="VCManagedResourceCompilerTool"
253	254	/>
254	255	<Tool
255	256	Name="VCResourceCompilerTool"
256		- PreprocessorDefinitions="_DEBUG"
	257	+ PreprocessorDefinitions="NDEBUG"
257	258	Culture="1033"
258	259	/>
259	260	<Tool

		@@ -262,17 +263,16 @@
262	263	<Tool
263	264	Name="VCLinkerTool"
264	265	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
265		- OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
266		- LinkIncremental="2"
	266	+ OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
	267	+ LinkIncremental="1"
267	268	SuppressStartupBanner="true"
268	269	GenerateManifest="false"
269	270	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"
270		- GenerateDebugInformation="true"
271		- ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
	271	+ ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
272	272	SubSystem="2"
273	273	RandomizedBaseAddress="1"
274	274	DataExecutionPrevention="0"
275		- TargetMachine="17"
	275	+ TargetMachine="1"
276	276	/>
277	277	<Tool
278	278	Name="VCALinkTool"

		@@ -330,7 +330,7 @@
330	330	Name="VCCLCompilerTool"
331	331	InlineFunctionExpansion="1"
332	332	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
333		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	333	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
334	334	StringPooling="true"
335	335	RuntimeLibrary="0"
336	336	EnableFunctionLevelLinking="true"

--- a/FFFTP_English.vcproj

+++ b/FFFTP_English.vcproj

		@@ -51,7 +51,7 @@
51	51	Name="VCCLCompilerTool"
52	52	Optimization="0"
53	53	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
54		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	54	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
55	55	BasicRuntimeChecks="3"
56	56	RuntimeLibrary="1"
57	57	PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"

		@@ -112,9 +112,9 @@
112	112	/>
113	113	</Configuration>
114	114	<Configuration
115		- Name="Release\|Win32"
116		- OutputDirectory=".\FFFTP_Eng_Release"
117		- IntermediateDirectory=".\FFFTP_Eng_Release"
	115	+ Name="Debug\|x64"
	116	+ OutputDirectory=".\FFFTP_Eng_Debug_64"
	117	+ IntermediateDirectory=".\FFFTP_Eng_Debug_64"
118	118	ConfigurationType="1"
119	119	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120	120	UseOfMFC="0"

		@@ -135,33 +135,33 @@
135	135	/>
136	136	<Tool
137	137	Name="VCMIDLTool"
138		- PreprocessorDefinitions="NDEBUG"
	138	+ PreprocessorDefinitions="_DEBUG"
139	139	MkTypLibCompatible="true"
140	140	SuppressStartupBanner="true"
141	141	TargetEnvironment="1"
142		- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
	142	+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143	143	/>
144	144	<Tool
145	145	Name="VCCLCompilerTool"
146		- InlineFunctionExpansion="1"
	146	+ Optimization="0"
147	147	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
148		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
149		- StringPooling="true"
150		- RuntimeLibrary="0"
151		- EnableFunctionLevelLinking="true"
152		- PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
153		- AssemblerListingLocation=".\FFFTP_Eng_Release\"
154		- ObjectFile=".\FFFTP_Eng_Release\"
155		- ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
	148	+ PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	149	+ BasicRuntimeChecks="3"
	150	+ RuntimeLibrary="1"
	151	+ PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
	152	+ AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
	153	+ ObjectFile=".\FFFTP_Eng_Debug_64\"
	154	+ ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
156	155	WarningLevel="3"
157	156	SuppressStartupBanner="true"
	157	+ DebugInformationFormat="4"
158	158	/>
159	159	<Tool
160	160	Name="VCManagedResourceCompilerTool"
161	161	/>
162	162	<Tool
163	163	Name="VCResourceCompilerTool"
164		- PreprocessorDefinitions="NDEBUG"
	164	+ PreprocessorDefinitions="_DEBUG"
165	165	Culture="1033"
166	166	/>
167	167	<Tool

		@@ -170,14 +170,15 @@
170	170	<Tool
171	171	Name="VCLinkerTool"
172	172	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
173		- OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
174		- LinkIncremental="1"
	173	+ OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
	174	+ LinkIncremental="2"
175	175	SuppressStartupBanner="true"
176	176	GenerateManifest="false"
177	177	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"
178		- ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
	178	+ GenerateDebugInformation="true"
	179	+ ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
179	180	SubSystem="2"
180		- TargetMachine="1"
	181	+ TargetMachine="17"
181	182	/>
182	183	<Tool
183	184	Name="VCALinkTool"

		@@ -205,9 +206,9 @@
205	206	/>
206	207	</Configuration>
207	208	<Configuration
208		- Name="Debug\|x64"
209		- OutputDirectory=".\FFFTP_Eng_Debug_64"
210		- IntermediateDirectory=".\FFFTP_Eng_Debug_64"
	209	+ Name="Release\|Win32"
	210	+ OutputDirectory=".\FFFTP_Eng_Release"
	211	+ IntermediateDirectory=".\FFFTP_Eng_Release"
211	212	ConfigurationType="1"
212	213	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213	214	UseOfMFC="0"

		@@ -228,33 +229,33 @@
228	229	/>
229	230	<Tool
230	231	Name="VCMIDLTool"
231		- PreprocessorDefinitions="_DEBUG"
	232	+ PreprocessorDefinitions="NDEBUG"
232	233	MkTypLibCompatible="true"
233	234	SuppressStartupBanner="true"
234	235	TargetEnvironment="1"
235		- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
	236	+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
236	237	/>
237	238	<Tool
238	239	Name="VCCLCompilerTool"
239		- Optimization="0"
	240	+ InlineFunctionExpansion="1"
240	241	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
241		- PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
242		- BasicRuntimeChecks="3"
243		- RuntimeLibrary="1"
244		- PrecompiledHeaderFile=".\FFFTP_Eng_Debug_64\FFFTP_English.pch"
245		- AssemblerListingLocation=".\FFFTP_Eng_Debug_64\"
246		- ObjectFile=".\FFFTP_Eng_Debug_64\"
247		- ProgramDataBaseFileName=".\FFFTP_Eng_Debug_64\"
	242	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
	243	+ StringPooling="true"
	244	+ RuntimeLibrary="0"
	245	+ EnableFunctionLevelLinking="true"
	246	+ PrecompiledHeaderFile=".\FFFTP_Eng_Release\FFFTP_English.pch"
	247	+ AssemblerListingLocation=".\FFFTP_Eng_Release\"
	248	+ ObjectFile=".\FFFTP_Eng_Release\"
	249	+ ProgramDataBaseFileName=".\FFFTP_Eng_Release\"
248	250	WarningLevel="3"
249	251	SuppressStartupBanner="true"
250		- DebugInformationFormat="4"
251	252	/>
252	253	<Tool
253	254	Name="VCManagedResourceCompilerTool"
254	255	/>
255	256	<Tool
256	257	Name="VCResourceCompilerTool"
257		- PreprocessorDefinitions="_DEBUG"
	258	+ PreprocessorDefinitions="NDEBUG"
258	259	Culture="1033"
259	260	/>
260	261	<Tool

		@@ -263,15 +264,14 @@
263	264	<Tool
264	265	Name="VCLinkerTool"
265	266	AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
266		- OutputFile=".\FFFTP_Eng_Debug_64\FFFTP.exe"
267		- LinkIncremental="2"
	267	+ OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
	268	+ LinkIncremental="1"
268	269	SuppressStartupBanner="true"
269	270	GenerateManifest="false"
270	271	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"
271		- GenerateDebugInformation="true"
272		- ProgramDatabaseFile=".\FFFTP_Eng_Debug_64\FFFTP.pdb"
	272	+ ProgramDatabaseFile=".\FFFTP_Eng_Release\FFFTP.pdb"
273	273	SubSystem="2"
274		- TargetMachine="17"
	274	+ TargetMachine="1"
275	275	/>
276	276	<Tool
277	277	Name="VCALinkTool"

		@@ -332,7 +332,7 @@
332	332	Name="VCCLCompilerTool"
333	333	InlineFunctionExpansion="1"
334	334	AdditionalIncludeDirectories="Resource_eng;contrib\openssl\include"
335		- PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,ENGLISH"
	335	+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,_CRT_SECURE_NO_WARNINGS,FFFTP_ENGLISH"
336	336	StringPooling="true"
337	337	RuntimeLibrary="0"
338	338	EnableFunctionLevelLinking="true"

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/common.h

+++ b/common.h

		@@ -30,7 +30,7 @@
30	30	#define __COMMON_H__
31	31
32	32	#include "config.h"
33		-#ifndef ENGLISH
	33	+#ifndef FFFTP_ENGLISH
34	34	#include "mesg-jpn.h"
35	35	#else
36	36	#include "mesg-eng.h"

--- a/putty/PuTTY.vcproj

+++ b/putty/PuTTY.vcproj

		@@ -90,12 +90,11 @@
90	90	/>
91	91	</Configuration>
92	92	<Configuration
93		- Name="Release\|Win32"
94		- OutputDirectory="$(ConfigurationName)"
95		- IntermediateDirectory="$(ConfigurationName)"
	93	+ Name="Debug\|x64"
	94	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	95	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
96	96	ConfigurationType="2"
97	97	CharacterSet="2"
98		- WholeProgramOptimization="1"
99	98	>
100	99	<Tool
101	100	Name="VCPreBuildEventTool"

		@@ -114,12 +113,12 @@
114	113	/>
115	114	<Tool
116	115	Name="VCCLCompilerTool"
117		- Optimization="2"
118		- EnableIntrinsicFunctions="true"
	116	+ Optimization="0"
119	117	AdditionalIncludeDirectories=".;CHARSET;WINDOWS"
120		- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"
121		- RuntimeLibrary="0"
122		- EnableFunctionLevelLinking="true"
	118	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"
	119	+ MinimalRebuild="true"
	120	+ BasicRuntimeChecks="3"
	121	+ RuntimeLibrary="1"
123	122	UsePrecompiledHeader="0"
124	123	WarningLevel="3"
125	124	DebugInformationFormat="3"

		@@ -135,12 +134,10 @@
135	134	/>
136	135	<Tool
137	136	Name="VCLinkerTool"
138		- LinkIncremental="1"
139		- GenerateDebugInformation="false"
	137	+ LinkIncremental="2"
	138	+ GenerateDebugInformation="true"
140	139	SubSystem="2"
141		- OptimizeReferences="2"
142		- EnableCOMDATFolding="2"
143		- TargetMachine="1"
	140	+ TargetMachine="17"
144	141	/>
145	142	<Tool
146	143	Name="VCALinkTool"

		@@ -165,11 +162,12 @@
165	162	/>
166	163	</Configuration>
167	164	<Configuration
168		- Name="Debug\|x64"
169		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
170		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	165	+ Name="Release\|Win32"
	166	+ OutputDirectory="$(ConfigurationName)"
	167	+ IntermediateDirectory="$(ConfigurationName)"
171	168	ConfigurationType="2"
172	169	CharacterSet="2"
	170	+ WholeProgramOptimization="1"
173	171	>
174	172	<Tool
175	173	Name="VCPreBuildEventTool"

		@@ -188,12 +186,12 @@
188	186	/>
189	187	<Tool
190	188	Name="VCCLCompilerTool"
191		- Optimization="0"
	189	+ Optimization="2"
	190	+ EnableIntrinsicFunctions="true"
192	191	AdditionalIncludeDirectories=".;CHARSET;WINDOWS"
193		- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"
194		- MinimalRebuild="true"
195		- BasicRuntimeChecks="3"
196		- RuntimeLibrary="1"
	192	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500,_WIN32_WINNT=0x0500,_WIN32_IE=0x0500,NTDDI_VERSION=0x05000100,SECURITY_WIN32;_USRDLL;PUTTY_EXPORTS"
	193	+ RuntimeLibrary="0"
	194	+ EnableFunctionLevelLinking="true"
197	195	UsePrecompiledHeader="0"
198	196	WarningLevel="3"
199	197	DebugInformationFormat="3"

		@@ -209,10 +207,12 @@
209	207	/>
210	208	<Tool
211	209	Name="VCLinkerTool"
212		- LinkIncremental="2"
213		- GenerateDebugInformation="true"
	210	+ LinkIncremental="1"
	211	+ GenerateDebugInformation="false"
214	212	SubSystem="2"
215		- TargetMachine="17"
	213	+ OptimizeReferences="2"
	214	+ EnableCOMDATFolding="2"
	215	+ TargetMachine="1"
216	216	/>
217	217	<Tool
218	218	Name="VCALinkTool"

--- a/toolmenu.c

+++ b/toolmenu.c

		@@ -289,7 +289,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
289	289	/===== ローカルのディレクトリ名ウインドウ =====/
290	290
291	291	SendMessage(hWndTbarLocal, TB_GETITEMRECT, 3, (LPARAM)&Rect1);
292		-#ifndef ENGLISH
	292	+#ifndef FFFTP_ENGLISH
293	293	DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,SHIFTJIS_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);
294	294	#else
295	295	DlgFont = CreateFont(Rect1.bottom-Rect1.top-8, 0, 0, 0, 0, FALSE,FALSE,FALSE,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,MSGJPN254);

ffftp.http://sabah.net/ Fork

コミット

タグ

よく使われているワード(クリックで追加)

コミットメタ情報

ログメッセージ

変更サマリ

差分

ffftp.http://sabah.net/
Fork