• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Loweynet


Commit MetaInfo

Revisão1c6203ce6ace264b85ef9b677f75ecad9fb7c862 (tree)
Hora2012-02-09 10:35:46
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Mensagem de Log

Fix project files.

Mudança Sumário

Diff

--- a/FFFTP.vc80ee.vcproj
+++ b/FFFTP.vc80ee.vcproj
@@ -111,9 +111,9 @@
111111 />
112112 </Configuration>
113113 <Configuration
114- Name="Release|Win32"
115- OutputDirectory=".\Release"
116- IntermediateDirectory=".\Release"
114+ Name="Debug|x64"
115+ OutputDirectory=".\Debug_64"
116+ IntermediateDirectory=".\Debug_64"
117117 ConfigurationType="1"
118118 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
119119 UseOfMFC="0"
@@ -134,34 +134,32 @@
134134 />
135135 <Tool
136136 Name="VCMIDLTool"
137- PreprocessorDefinitions="NDEBUG"
137+ PreprocessorDefinitions="_DEBUG"
138138 MkTypLibCompatible="true"
139139 SuppressStartupBanner="true"
140140 TargetEnvironment="1"
141- TypeLibraryName=".\Release\FFFTP.tlb"
141+ TypeLibraryName=".\Debug_64\FFFTP.tlb"
142142 />
143143 <Tool
144144 Name="VCCLCompilerTool"
145- InlineFunctionExpansion="1"
145+ Optimization="0"
146146 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\"
155153 WarningLevel="3"
156154 SuppressStartupBanner="true"
157- DebugInformationFormat="0"
155+ DebugInformationFormat="4"
158156 />
159157 <Tool
160158 Name="VCManagedResourceCompilerTool"
161159 />
162160 <Tool
163161 Name="VCResourceCompilerTool"
164- PreprocessorDefinitions="NDEBUG"
162+ PreprocessorDefinitions="_DEBUG"
165163 Culture="1041"
166164 />
167165 <Tool
@@ -169,15 +167,16 @@
169167 />
170168 <Tool
171169 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"
175173 SuppressStartupBanner="true"
176174 GenerateManifest="false"
177175 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"
179178 SubSystem="2"
180- TargetMachine="1"
179+ TargetMachine="17"
181180 />
182181 <Tool
183182 Name="VCALinkTool"
@@ -205,9 +204,9 @@
205204 />
206205 </Configuration>
207206 <Configuration
208- Name="Debug|x64"
209- OutputDirectory=".\Debug_64"
210- IntermediateDirectory=".\Debug_64"
207+ Name="Release|Win32"
208+ OutputDirectory=".\Release"
209+ IntermediateDirectory=".\Release"
211210 ConfigurationType="1"
212211 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213212 UseOfMFC="0"
@@ -228,32 +227,34 @@
228227 />
229228 <Tool
230229 Name="VCMIDLTool"
231- PreprocessorDefinitions="_DEBUG"
230+ PreprocessorDefinitions="NDEBUG"
232231 MkTypLibCompatible="true"
233232 SuppressStartupBanner="true"
234233 TargetEnvironment="1"
235- TypeLibraryName=".\Debug_64\FFFTP.tlb"
234+ TypeLibraryName=".\Release\FFFTP.tlb"
236235 />
237236 <Tool
238237 Name="VCCLCompilerTool"
239- Optimization="0"
238+ InlineFunctionExpansion="1"
240239 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\"
247248 WarningLevel="3"
248249 SuppressStartupBanner="true"
249- DebugInformationFormat="4"
250+ DebugInformationFormat="0"
250251 />
251252 <Tool
252253 Name="VCManagedResourceCompilerTool"
253254 />
254255 <Tool
255256 Name="VCResourceCompilerTool"
256- PreprocessorDefinitions="_DEBUG"
257+ PreprocessorDefinitions="NDEBUG"
257258 Culture="1041"
258259 />
259260 <Tool
@@ -261,16 +262,15 @@
261262 />
262263 <Tool
263264 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"
267268 SuppressStartupBanner="true"
268269 GenerateManifest="false"
269270 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"
272272 SubSystem="2"
273- TargetMachine="17"
273+ TargetMachine="1"
274274 />
275275 <Tool
276276 Name="VCALinkTool"
--- a/FFFTP.vcproj
+++ b/FFFTP.vcproj
@@ -111,9 +111,9 @@
111111 />
112112 </Configuration>
113113 <Configuration
114- Name="Release|Win32"
115- OutputDirectory=".\Release"
116- IntermediateDirectory=".\Release"
114+ Name="Debug|x64"
115+ OutputDirectory=".\Debug_64"
116+ IntermediateDirectory=".\Debug_64"
117117 ConfigurationType="1"
118118 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
119119 UseOfMFC="0"
@@ -134,34 +134,32 @@
134134 />
135135 <Tool
136136 Name="VCMIDLTool"
137- PreprocessorDefinitions="NDEBUG"
137+ PreprocessorDefinitions="_DEBUG"
138138 MkTypLibCompatible="true"
139139 SuppressStartupBanner="true"
140140 TargetEnvironment="1"
141- TypeLibraryName=".\Release\FFFTP.tlb"
141+ TypeLibraryName=".\Debug_64\FFFTP.tlb"
142142 />
143143 <Tool
144144 Name="VCCLCompilerTool"
145- InlineFunctionExpansion="1"
145+ Optimization="0"
146146 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\"
155153 WarningLevel="3"
156154 SuppressStartupBanner="true"
157- DebugInformationFormat="0"
155+ DebugInformationFormat="4"
158156 />
159157 <Tool
160158 Name="VCManagedResourceCompilerTool"
161159 />
162160 <Tool
163161 Name="VCResourceCompilerTool"
164- PreprocessorDefinitions="NDEBUG"
162+ PreprocessorDefinitions="_DEBUG"
165163 Culture="1041"
166164 />
167165 <Tool
@@ -170,14 +168,15 @@
170168 <Tool
171169 Name="VCLinkerTool"
172170 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"
175173 SuppressStartupBanner="true"
176174 GenerateManifest="false"
177175 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"
179178 SubSystem="2"
180- TargetMachine="1"
179+ TargetMachine="17"
181180 />
182181 <Tool
183182 Name="VCALinkTool"
@@ -205,9 +204,9 @@
205204 />
206205 </Configuration>
207206 <Configuration
208- Name="Debug|x64"
209- OutputDirectory=".\Debug_64"
210- IntermediateDirectory=".\Debug_64"
207+ Name="Release|Win32"
208+ OutputDirectory=".\Release"
209+ IntermediateDirectory=".\Release"
211210 ConfigurationType="1"
212211 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213212 UseOfMFC="0"
@@ -228,32 +227,34 @@
228227 />
229228 <Tool
230229 Name="VCMIDLTool"
231- PreprocessorDefinitions="_DEBUG"
230+ PreprocessorDefinitions="NDEBUG"
232231 MkTypLibCompatible="true"
233232 SuppressStartupBanner="true"
234233 TargetEnvironment="1"
235- TypeLibraryName=".\Debug_64\FFFTP.tlb"
234+ TypeLibraryName=".\Release\FFFTP.tlb"
236235 />
237236 <Tool
238237 Name="VCCLCompilerTool"
239- Optimization="0"
238+ InlineFunctionExpansion="1"
240239 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\"
247248 WarningLevel="3"
248249 SuppressStartupBanner="true"
249- DebugInformationFormat="4"
250+ DebugInformationFormat="0"
250251 />
251252 <Tool
252253 Name="VCManagedResourceCompilerTool"
253254 />
254255 <Tool
255256 Name="VCResourceCompilerTool"
256- PreprocessorDefinitions="_DEBUG"
257+ PreprocessorDefinitions="NDEBUG"
257258 Culture="1041"
258259 />
259260 <Tool
@@ -262,15 +263,14 @@
262263 <Tool
263264 Name="VCLinkerTool"
264265 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"
267268 SuppressStartupBanner="true"
268269 GenerateManifest="false"
269270 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"
272272 SubSystem="2"
273- TargetMachine="17"
273+ TargetMachine="1"
274274 />
275275 <Tool
276276 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 @@
5151 Name="VCCLCompilerTool"
5252 Optimization="0"
5353 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"
5555 BasicRuntimeChecks="3"
5656 RuntimeLibrary="1"
5757 PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -112,9 +112,9 @@
112112 />
113113 </Configuration>
114114 <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"
118118 ConfigurationType="1"
119119 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120120 UseOfMFC="0"
@@ -135,33 +135,33 @@
135135 />
136136 <Tool
137137 Name="VCMIDLTool"
138- PreprocessorDefinitions="NDEBUG"
138+ PreprocessorDefinitions="_DEBUG"
139139 MkTypLibCompatible="true"
140140 SuppressStartupBanner="true"
141141 TargetEnvironment="1"
142- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
142+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143143 />
144144 <Tool
145145 Name="VCCLCompilerTool"
146- InlineFunctionExpansion="1"
146+ Optimization="0"
147147 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\"
156155 WarningLevel="3"
157156 SuppressStartupBanner="true"
157+ DebugInformationFormat="4"
158158 />
159159 <Tool
160160 Name="VCManagedResourceCompilerTool"
161161 />
162162 <Tool
163163 Name="VCResourceCompilerTool"
164- PreprocessorDefinitions="NDEBUG"
164+ PreprocessorDefinitions="_DEBUG"
165165 Culture="1033"
166166 />
167167 <Tool
@@ -169,15 +169,16 @@
169169 />
170170 <Tool
171171 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"
175175 SuppressStartupBanner="true"
176176 GenerateManifest="false"
177177 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"
179180 SubSystem="2"
180- TargetMachine="1"
181+ TargetMachine="17"
181182 />
182183 <Tool
183184 Name="VCALinkTool"
@@ -205,9 +206,9 @@
205206 />
206207 </Configuration>
207208 <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"
211212 ConfigurationType="1"
212213 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213214 UseOfMFC="0"
@@ -228,33 +229,33 @@
228229 />
229230 <Tool
230231 Name="VCMIDLTool"
231- PreprocessorDefinitions="_DEBUG"
232+ PreprocessorDefinitions="NDEBUG"
232233 MkTypLibCompatible="true"
233234 SuppressStartupBanner="true"
234235 TargetEnvironment="1"
235- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
236+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
236237 />
237238 <Tool
238239 Name="VCCLCompilerTool"
239- Optimization="0"
240+ InlineFunctionExpansion="1"
240241 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\"
248250 WarningLevel="3"
249251 SuppressStartupBanner="true"
250- DebugInformationFormat="4"
251252 />
252253 <Tool
253254 Name="VCManagedResourceCompilerTool"
254255 />
255256 <Tool
256257 Name="VCResourceCompilerTool"
257- PreprocessorDefinitions="_DEBUG"
258+ PreprocessorDefinitions="NDEBUG"
258259 Culture="1033"
259260 />
260261 <Tool
@@ -262,16 +263,15 @@
262263 />
263264 <Tool
264265 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"
268269 SuppressStartupBanner="true"
269270 GenerateManifest="false"
270271 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"
273273 SubSystem="2"
274- TargetMachine="17"
274+ TargetMachine="1"
275275 />
276276 <Tool
277277 Name="VCALinkTool"
@@ -332,7 +332,7 @@
332332 Name="VCCLCompilerTool"
333333 InlineFunctionExpansion="1"
334334 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"
336336 StringPooling="true"
337337 RuntimeLibrary="0"
338338 EnableFunctionLevelLinking="true"
--- a/FFFTP_English.vc90.vcproj
+++ b/FFFTP_English.vc90.vcproj
@@ -52,7 +52,7 @@
5252 Name="VCCLCompilerTool"
5353 Optimization="0"
5454 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"
5656 BasicRuntimeChecks="3"
5757 RuntimeLibrary="1"
5858 PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -112,9 +112,9 @@
112112 />
113113 </Configuration>
114114 <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"
118118 ConfigurationType="1"
119119 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120120 UseOfMFC="0"
@@ -135,33 +135,33 @@
135135 />
136136 <Tool
137137 Name="VCMIDLTool"
138- PreprocessorDefinitions="NDEBUG"
138+ PreprocessorDefinitions="_DEBUG"
139139 MkTypLibCompatible="true"
140140 SuppressStartupBanner="true"
141141 TargetEnvironment="1"
142- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
142+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143143 />
144144 <Tool
145145 Name="VCCLCompilerTool"
146- InlineFunctionExpansion="1"
146+ Optimization="0"
147147 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\"
156155 WarningLevel="3"
157156 SuppressStartupBanner="true"
157+ DebugInformationFormat="4"
158158 />
159159 <Tool
160160 Name="VCManagedResourceCompilerTool"
161161 />
162162 <Tool
163163 Name="VCResourceCompilerTool"
164- PreprocessorDefinitions="NDEBUG"
164+ PreprocessorDefinitions="_DEBUG"
165165 Culture="1033"
166166 />
167167 <Tool
@@ -170,16 +170,17 @@
170170 <Tool
171171 Name="VCLinkerTool"
172172 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"
175175 SuppressStartupBanner="true"
176176 GenerateManifest="false"
177177 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"
179180 SubSystem="2"
180181 RandomizedBaseAddress="1"
181182 DataExecutionPrevention="0"
182- TargetMachine="1"
183+ TargetMachine="17"
183184 />
184185 <Tool
185186 Name="VCALinkTool"
@@ -204,9 +205,9 @@
204205 />
205206 </Configuration>
206207 <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"
210211 ConfigurationType="1"
211212 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
212213 UseOfMFC="0"
@@ -227,33 +228,33 @@
227228 />
228229 <Tool
229230 Name="VCMIDLTool"
230- PreprocessorDefinitions="_DEBUG"
231+ PreprocessorDefinitions="NDEBUG"
231232 MkTypLibCompatible="true"
232233 SuppressStartupBanner="true"
233234 TargetEnvironment="1"
234- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
235+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
235236 />
236237 <Tool
237238 Name="VCCLCompilerTool"
238- Optimization="0"
239+ InlineFunctionExpansion="1"
239240 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\"
247249 WarningLevel="3"
248250 SuppressStartupBanner="true"
249- DebugInformationFormat="4"
250251 />
251252 <Tool
252253 Name="VCManagedResourceCompilerTool"
253254 />
254255 <Tool
255256 Name="VCResourceCompilerTool"
256- PreprocessorDefinitions="_DEBUG"
257+ PreprocessorDefinitions="NDEBUG"
257258 Culture="1033"
258259 />
259260 <Tool
@@ -262,17 +263,16 @@
262263 <Tool
263264 Name="VCLinkerTool"
264265 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"
267268 SuppressStartupBanner="true"
268269 GenerateManifest="false"
269270 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"
272272 SubSystem="2"
273273 RandomizedBaseAddress="1"
274274 DataExecutionPrevention="0"
275- TargetMachine="17"
275+ TargetMachine="1"
276276 />
277277 <Tool
278278 Name="VCALinkTool"
@@ -330,7 +330,7 @@
330330 Name="VCCLCompilerTool"
331331 InlineFunctionExpansion="1"
332332 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"
334334 StringPooling="true"
335335 RuntimeLibrary="0"
336336 EnableFunctionLevelLinking="true"
--- a/FFFTP_English.vcproj
+++ b/FFFTP_English.vcproj
@@ -51,7 +51,7 @@
5151 Name="VCCLCompilerTool"
5252 Optimization="0"
5353 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"
5555 BasicRuntimeChecks="3"
5656 RuntimeLibrary="1"
5757 PrecompiledHeaderFile=".\FFFTP_Eng_Debug\FFFTP_English.pch"
@@ -112,9 +112,9 @@
112112 />
113113 </Configuration>
114114 <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"
118118 ConfigurationType="1"
119119 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
120120 UseOfMFC="0"
@@ -135,33 +135,33 @@
135135 />
136136 <Tool
137137 Name="VCMIDLTool"
138- PreprocessorDefinitions="NDEBUG"
138+ PreprocessorDefinitions="_DEBUG"
139139 MkTypLibCompatible="true"
140140 SuppressStartupBanner="true"
141141 TargetEnvironment="1"
142- TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
142+ TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
143143 />
144144 <Tool
145145 Name="VCCLCompilerTool"
146- InlineFunctionExpansion="1"
146+ Optimization="0"
147147 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\"
156155 WarningLevel="3"
157156 SuppressStartupBanner="true"
157+ DebugInformationFormat="4"
158158 />
159159 <Tool
160160 Name="VCManagedResourceCompilerTool"
161161 />
162162 <Tool
163163 Name="VCResourceCompilerTool"
164- PreprocessorDefinitions="NDEBUG"
164+ PreprocessorDefinitions="_DEBUG"
165165 Culture="1033"
166166 />
167167 <Tool
@@ -170,14 +170,15 @@
170170 <Tool
171171 Name="VCLinkerTool"
172172 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"
175175 SuppressStartupBanner="true"
176176 GenerateManifest="false"
177177 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"
179180 SubSystem="2"
180- TargetMachine="1"
181+ TargetMachine="17"
181182 />
182183 <Tool
183184 Name="VCALinkTool"
@@ -205,9 +206,9 @@
205206 />
206207 </Configuration>
207208 <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"
211212 ConfigurationType="1"
212213 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
213214 UseOfMFC="0"
@@ -228,33 +229,33 @@
228229 />
229230 <Tool
230231 Name="VCMIDLTool"
231- PreprocessorDefinitions="_DEBUG"
232+ PreprocessorDefinitions="NDEBUG"
232233 MkTypLibCompatible="true"
233234 SuppressStartupBanner="true"
234235 TargetEnvironment="1"
235- TypeLibraryName=".\FFFTP_Eng_Debug_64\FFFTP_English.tlb"
236+ TypeLibraryName=".\FFFTP_Eng_Release\FFFTP_English.tlb"
236237 />
237238 <Tool
238239 Name="VCCLCompilerTool"
239- Optimization="0"
240+ InlineFunctionExpansion="1"
240241 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\"
248250 WarningLevel="3"
249251 SuppressStartupBanner="true"
250- DebugInformationFormat="4"
251252 />
252253 <Tool
253254 Name="VCManagedResourceCompilerTool"
254255 />
255256 <Tool
256257 Name="VCResourceCompilerTool"
257- PreprocessorDefinitions="_DEBUG"
258+ PreprocessorDefinitions="NDEBUG"
258259 Culture="1033"
259260 />
260261 <Tool
@@ -263,15 +264,14 @@
263264 <Tool
264265 Name="VCLinkerTool"
265266 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"
268269 SuppressStartupBanner="true"
269270 GenerateManifest="false"
270271 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"
273273 SubSystem="2"
274- TargetMachine="17"
274+ TargetMachine="1"
275275 />
276276 <Tool
277277 Name="VCALinkTool"
@@ -332,7 +332,7 @@
332332 Name="VCCLCompilerTool"
333333 InlineFunctionExpansion="1"
334334 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"
336336 StringPooling="true"
337337 RuntimeLibrary="0"
338338 EnableFunctionLevelLinking="true"
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
--- a/common.h
+++ b/common.h
@@ -30,7 +30,7 @@
3030 #define __COMMON_H__
3131
3232 #include "config.h"
33-#ifndef ENGLISH
33+#ifndef FFFTP_ENGLISH
3434 #include "mesg-jpn.h"
3535 #else
3636 #include "mesg-eng.h"
--- a/putty/PuTTY.vcproj
+++ b/putty/PuTTY.vcproj
@@ -90,12 +90,11 @@
9090 />
9191 </Configuration>
9292 <Configuration
93- Name="Release|Win32"
94- OutputDirectory="$(ConfigurationName)"
95- IntermediateDirectory="$(ConfigurationName)"
93+ Name="Debug|x64"
94+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
95+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
9696 ConfigurationType="2"
9797 CharacterSet="2"
98- WholeProgramOptimization="1"
9998 >
10099 <Tool
101100 Name="VCPreBuildEventTool"
@@ -114,12 +113,12 @@
114113 />
115114 <Tool
116115 Name="VCCLCompilerTool"
117- Optimization="2"
118- EnableIntrinsicFunctions="true"
116+ Optimization="0"
119117 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"
123122 UsePrecompiledHeader="0"
124123 WarningLevel="3"
125124 DebugInformationFormat="3"
@@ -135,12 +134,10 @@
135134 />
136135 <Tool
137136 Name="VCLinkerTool"
138- LinkIncremental="1"
139- GenerateDebugInformation="false"
137+ LinkIncremental="2"
138+ GenerateDebugInformation="true"
140139 SubSystem="2"
141- OptimizeReferences="2"
142- EnableCOMDATFolding="2"
143- TargetMachine="1"
140+ TargetMachine="17"
144141 />
145142 <Tool
146143 Name="VCALinkTool"
@@ -165,11 +162,12 @@
165162 />
166163 </Configuration>
167164 <Configuration
168- Name="Debug|x64"
169- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
170- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
165+ Name="Release|Win32"
166+ OutputDirectory="$(ConfigurationName)"
167+ IntermediateDirectory="$(ConfigurationName)"
171168 ConfigurationType="2"
172169 CharacterSet="2"
170+ WholeProgramOptimization="1"
173171 >
174172 <Tool
175173 Name="VCPreBuildEventTool"
@@ -188,12 +186,12 @@
188186 />
189187 <Tool
190188 Name="VCCLCompilerTool"
191- Optimization="0"
189+ Optimization="2"
190+ EnableIntrinsicFunctions="true"
192191 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"
197195 UsePrecompiledHeader="0"
198196 WarningLevel="3"
199197 DebugInformationFormat="3"
@@ -209,10 +207,12 @@
209207 />
210208 <Tool
211209 Name="VCLinkerTool"
212- LinkIncremental="2"
213- GenerateDebugInformation="true"
210+ LinkIncremental="1"
211+ GenerateDebugInformation="false"
214212 SubSystem="2"
215- TargetMachine="17"
213+ OptimizeReferences="2"
214+ EnableCOMDATFolding="2"
215+ TargetMachine="1"
216216 />
217217 <Tool
218218 Name="VCALinkTool"
--- a/toolmenu.c
+++ b/toolmenu.c
@@ -289,7 +289,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
289289 /*===== ローカルのディレクトリ名ウインドウ =====*/
290290
291291 SendMessage(hWndTbarLocal, TB_GETITEMRECT, 3, (LPARAM)&Rect1);
292-#ifndef ENGLISH
292+#ifndef FFFTP_ENGLISH
293293 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);
294294 #else
295295 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);