WebSVN – gelsvn – Diff – /trunk/MPC/templates/vc8.mpd

 			ConfigurationType="10"
 <%else%>
 			ConfigurationType="<%ConfigurationType%>"
 <%endif%>
 <%endif%>
+<%if(UseOfATL)%>
+			UseOfATL="<%UseOfATL%>"
+<%endif%>
 <%if(UseOfMFC)%>
 			UseOfMFC="<%UseOfMFC%>"
 <%endif%>
 			CharacterSet="<%charset("0")%>"
+			>
 			<Tool
 				Name="VCPreBuildEventTool"
+<%if(prebuild)%>
+				CommandLine="<%eval(prebuild)%>"
+<%endif%>
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 <%if(!custom_only)%>
 				MinimalRebuild="<%MinimalRebuild("true")%>"
 <%endif%>
 <%if(ExceptionHandling)%>
 				ExceptionHandling="<%ExceptionHandling("2")%>"
 <%endif%>
-<%if(!optimize)%>
+<%if(optimize)%>
+<%if(BasicRuntimeChecks)%>
+				BasicRuntimeChecks="<%BasicRuntimeChecks%>"
+<%endif%>
+<%else%>
 				BasicRuntimeChecks="<%BasicRuntimeChecks("3")%>"
 <%endif%>
 <%if(SmallerTypeCheck)%>
 				SmallerTypeCheck="<%SmallerTypeCheck%>"
 <%endif%>
+<%if(runtime_library)%>
-				RuntimeLibrary="<%RuntimeLibrary("3")%>"
+				RuntimeLibrary="<%runtime_library%>"
+<%else%>
+				RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(debug_prj)%>1<%else%>0<%endif%><%else%><%if(debug_prj)%>3<%else%>2<%endif%><%endif%>"
+<%endif%>
 <%if(StructMemberAlignment)%>
 				StructMemberAlignment="<%StructMemberAlignment%>"
 <%endif%>
 <%if(BufferSecurityCheck)%>
 				BufferSecurityCheck="<%BufferSecurityCheck%>"
 <%if(win_version)%>
 				Version="<%win_version%>"
 <%endif%>
 				LinkIncremental="<%LinkIncremental("2")%>"
 				SuppressStartupBanner="<%SuppressStartupBanner("true")%>"
-				AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%>"
+				AdditionalLibraryDirectories="<%foreach(libpaths)%><%if(output_subdir)%><%libpath%>\<%output_subdir%>;<%endif%><%libpath%><%fornotlast(";")%><%endfor%>"
 <%if(ShowProgress)%>
 				ShowProgress="<%ShowProgress%>"
 <%endif%>
 <%if(ignore_default_library_names)%>
 				IgnoreDefaultLibraryNames="<%foreach(ignore_default_library_names)%><%ignore_default_library_name%><%fornotlast(";")%><%endfor%>"
 <%endif%>
 <%if(TurnOffAssemblyGeneration)%>
 				TurnOffAssemblyGeneration="<%TurnOffAssemblyGeneration%>"
 <%endif%>
 <%if(type_is_dynamic && sharedname)%>
-				ImportLibrary="<%libout%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"
+				ImportLibrary="$(OutDir)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"
 <%endif%>
 <%if(SupportUnloadOfDelayLoadedDLL)%>
 				SupportUnloadOfDelayLoadedDLL="<%SupportUnloadOfDelayLoadedDLL%>"
 <%endif%>
 <%if(ImportLibrary)%>
 <%endfor%>
 <%endfor%>
 			</File>
 <%endif%>
 <%if(grouped_source_files)%>
-<%foreach(grouped_source_files)%>
+<%foreach(sort(grouped_source_files))%>
 <%if(compares(grouped_source_file, default_group))%>
 <%foreach(grouped_source_file->files)%>
 			<File
 				RelativePath="<%grouped_source_file->file%>">
 <%if(duplicate_index(grouped_source_file->file))%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>">
 					<Tool
 						Name="VCCLCompilerTool"
+<%if(flag_overrides(grouped_source_file->file, buildflags))%>
+						AdditionalOptions="<%flag_overrides(grouped_source_file->file, buildflags)%>"
+<%endif%>
 						ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(grouped_source_file->file)%>.obj"/>
 				</FileConfiguration>
 <%endfor%>
 <%endfor%>
+<%else%>
+<%if(flag_overrides(grouped_source_file->file, buildflags))%>
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+				<FileConfiguration
+					Name="<%configuration%>|<%platform%>">
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="<%flag_overrides(grouped_source_file->file, buildflags)%>"/>
+				</FileConfiguration>
+<%endfor%>
+<%endfor%>
+<%endif%>
 <%endif%>
 			</File>
 <%endfor%>
 <%else%>
 			<Filter
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>">
 						<Tool
 							Name="VCCLCompilerTool"
+<%if(flag_overrides(grouped_source_file->file, buildflags))%>
+							AdditionalOptions="<%flag_overrides(grouped_source_file->file, buildflags)%>"
+<%endif%>
 							ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(grouped_source_file->file)%>.obj"/>
 					</FileConfiguration>
 <%endfor%>
 <%endfor%>
+<%else%>
+<%if(flag_overrides(grouped_source_file->file, buildflags))%>
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+					<FileConfiguration
+						Name="<%configuration%>|<%platform%>">
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalOptions="<%flag_overrides(grouped_source_file->file, buildflags)%>"/>
+					</FileConfiguration>
+<%endfor%>
+<%endfor%>
+<%endif%>
 <%endif%>
 				</File>
 <%endfor%>
 			</Filter>
 <%endif%>
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>">
 						<Tool
 							Name="VCCLCompilerTool"
+<%if(flag_overrides(source_file, buildflags))%>
+							AdditionalOptions="<%flag_overrides(source_file, buildflags)%>"
+<%endif%>
-						ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(source_file)%>.obj"/>
+							ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(source_file)%>.obj"/>
+					</FileConfiguration>
+<%endfor%>
+<%endfor%>
+<%else%>
+<%if(flag_overrides(source_file, buildflags))%>
+<%foreach(platforms)%>
+<%foreach(configurations)%>
+					<FileConfiguration
+						Name="<%configuration%>|<%platform%>">
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalOptions="<%flag_overrides(source_file, buildflags)%>"/>
 					</FileConfiguration>
 <%endfor%>
 <%endfor%>
 <%endif%>
+<%endif%>
 			</File>
 <%endfor%>
 <%endif%>
 		</Filter>
 <%endif%>
 			<File
 				 RelativePath="<%pch_header%>">
 			</File>
 <%endif%>
 <%if(grouped_header_files)%>
-<%foreach(grouped_header_files)%>
+<%foreach(sort(grouped_header_files))%>
 <%if(compares(grouped_header_file, default_group))%>
 <%foreach(grouped_header_file->files)%>
 			<File
 				RelativePath="<%grouped_header_file->file%>">
 			</File>
 <%if(inline_files)%>
 		<Filter
 			Name="Inline Files"
 			Filter="i;inl">
 <%if(grouped_inline_files)%>
-<%foreach(grouped_inline_files)%>
+<%foreach(sort(grouped_inline_files))%>
 <%if(compares(grouped_inline_file, default_group))%>
 <%foreach(grouped_inline_file->files)%>
-				<File
+			<File
-					RelativePath="<%grouped_inline_file->file%>">
+				RelativePath="<%grouped_inline_file->file%>">
-				</File>
+			</File>
 <%endfor%>
 <%else%>
 			<Filter
 				Name="<%grouped_inline_file%>"
 				Filter="">
 <%if(template_files)%>
 		<Filter
 			Name="Template Files"
 			Filter="">
 <%if(grouped_template_files)%>
-<%foreach(grouped_template_files)%>
+<%foreach(sort(grouped_template_files))%>
 <%if(compares(grouped_template_file, default_group))%>
 <%foreach(grouped_template_file->files)%>
 			<File
 				RelativePath="<%grouped_template_file->file%>">
 <%foreach(platforms)%>
 <%if(documentation_files)%>
 		<Filter
 			Name="Documentation"
 			Filter="">
 <%if(grouped_documentation_files)%>
-<%foreach(grouped_documentation_files)%>
+<%foreach(sort(grouped_documentation_files))%>
 <%if(compares(grouped_documentation_file, default_group))%>
 <%foreach(grouped_documentation_file->files)%>
 			<File
 				RelativePath="<%grouped_documentation_file->file%>">
 <%foreach(platforms)%>
 <%if(resource_files && !type_is_static)%>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
 <%if(grouped_resource_files)%>
-<%foreach(grouped_resource_files)%>
+<%foreach(sort(grouped_resource_files))%>
 <%if(compares(grouped_resource_file, default_group))%>
 <%foreach(grouped_resource_file->files)%>
 			<File
 				RelativePath="<%grouped_resource_file->file%>">
 			</File>

Subversion Repositories gelsvn

(root)/trunk/MPC/templates/vc8.mpd – Rev 198 → 217