diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2006-02-09 18:51:14 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2006-02-09 18:51:14 +0000 |
commit | 1ebd82b874cdbb46569a0956aa896c643173eea1 (patch) | |
tree | 2d4ccbe3b1ae33ebc7a961dab19c02a6f04801e0 | |
parent | 049b243624faabdb788fa410ea2bccd4039e4b18 (diff) | |
download | MPC-1ebd82b874cdbb46569a0956aa896c643173eea1.tar.gz |
ChangeLogTag: Thu Feb 9 12:50:52 2006 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | ChangeLog | 61 | ||||
-rw-r--r-- | config/boost_iostreams.mpb | 8 | ||||
-rw-r--r-- | config/boost_program_options.mpb | 8 | ||||
-rw-r--r-- | config/boost_python.mpb | 8 | ||||
-rw-r--r-- | config/boost_serialization.mpb | 8 | ||||
-rw-r--r-- | config/boost_wave.mpb | 8 | ||||
-rw-r--r-- | modules/DirectoryManager.pm | 2 | ||||
-rw-r--r-- | modules/Options.pm | 4 | ||||
-rw-r--r-- | modules/ProjectCreator.pm | 51 | ||||
-rw-r--r-- | modules/TemplateParser.pm | 1 | ||||
-rw-r--r-- | modules/WorkspaceCreator.pm | 56 | ||||
-rw-r--r-- | templates/bmake.mpd | 2 | ||||
-rw-r--r-- | templates/bmakedll.mpt | 1 | ||||
-rw-r--r-- | templates/bmakedllexe.mpt | 1 | ||||
-rw-r--r-- | templates/bmakelib.mpt | 1 | ||||
-rw-r--r-- | templates/bmakelibexe.mpt | 1 | ||||
-rw-r--r-- | templates/em3.mpd | 18 | ||||
-rw-r--r-- | templates/em3vcpdll.mpt | 4 | ||||
-rw-r--r-- | templates/em3vcpdllexe.mpt | 4 | ||||
-rw-r--r-- | templates/em3vcplibexe.mpt | 4 | ||||
-rw-r--r-- | templates/vc6.mpd | 12 | ||||
-rw-r--r-- | templates/vc7.mpd | 12 | ||||
-rw-r--r-- | templates/vc8.mpd | 12 |
23 files changed, 234 insertions, 53 deletions
@@ -1,3 +1,64 @@ +Thu Feb 9 12:50:52 2006 Chad Elliott <elliott_c@ociweb.com> + + * config/boost_iostreams.mpb: + * config/boost_program_options.mpb: + * config/boost_python.mpb: + * config/boost_serialization.mpb: + * config/boost_wave.mpb: + + Added support for other boost libraries. + + * modules/DirectoryManager.pm: + * modules/Options.pm: + + Added support for wildcards when using the -exclude option. + + * modules/ProjectCreator.pm: + + When the Define_Custom has the automatic flag set to 1, + automatically add the files generated that are specified by the >> + operator. + + Fixed a bug where <% %> variables used within a 'specific' section + were not translated. + + * modules/TemplateParser.pm: + + Fixed a bug where errors within a <%foreach%> would be silently + ignored. + + * modules/WorkspaceCreator.pm: + + Added support for wildcards. + + * templates/bmake.mpd: + * templates/bmakedll.mpt: + * templates/bmakedllexe.mpt: + * templates/bmakelib.mpt: + * templates/bmakelibexe.mpt: + + Fixed a bug where debug_flags was being placed in all + configurations, not just debug. And modified these, so that debug + flags are only emitted in a debug configuration (when optimze is + overriden to be zero). + + * templates/em3.mpd: + * templates/em3vcpdll.mpt: + * templates/em3vcpdllexe.mpt: + * templates/em3vcplibexe.mpt: + + EVC 4.0 doesn't support "utility" projects, so when custom_only is + set to 1, just create a DLL project that has no target. Also, + fixed link issues for the emulator and x86 targets. And, sort the + grouped files so that a project can be reproduced consistently. + + * templates/vc6.mpd: + * templates/vc7.mpd: + * templates/vc8.mpd: + + Sort the grouped files so that a project can be reproduced + consistently. + Thu Feb 2 07:02:19 2006 Chad Elliott <elliott_c@ociweb.com> * clone_build_tree.pl: diff --git a/config/boost_iostreams.mpb b/config/boost_iostreams.mpb new file mode 100644 index 00000000..1a2a3718 --- /dev/null +++ b/config/boost_iostreams.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: boost_base { + specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) { + lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_iostreams$(BOOST_CFG) + } +} diff --git a/config/boost_program_options.mpb b/config/boost_program_options.mpb new file mode 100644 index 00000000..84c87816 --- /dev/null +++ b/config/boost_program_options.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: boost_base { + specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) { + lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_program_options$(BOOST_CFG) + } +} diff --git a/config/boost_python.mpb b/config/boost_python.mpb new file mode 100644 index 00000000..380d48b6 --- /dev/null +++ b/config/boost_python.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: boost_base { + specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) { + lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_python$(BOOST_CFG) + } +} diff --git a/config/boost_serialization.mpb b/config/boost_serialization.mpb new file mode 100644 index 00000000..6dfe9056 --- /dev/null +++ b/config/boost_serialization.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: boost_base { + specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) { + lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_serialization$(BOOST_CFG) + } +} diff --git a/config/boost_wave.mpb b/config/boost_wave.mpb new file mode 100644 index 00000000..395af79e --- /dev/null +++ b/config/boost_wave.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: boost_base { + specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) { + lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_wave$(BOOST_CFG) + } +} diff --git a/modules/DirectoryManager.pm b/modules/DirectoryManager.pm index 38ee6db5..d563868e 100644 --- a/modules/DirectoryManager.pm +++ b/modules/DirectoryManager.pm @@ -123,7 +123,7 @@ sub mpc_glob { my($post) = $3; for(my $i = 0; $i < length($mid); $i++) { my($p) = $pre . substr($mid, $i, 1) . $post; - foreach my $new ($self->mpc_glob($p)) { + foreach my $new (DirectoryManager::mpc_glob($self, $p)) { my($found) = undef; foreach my $file (@files) { if ($file eq $new) { diff --git a/modules/Options.pm b/modules/Options.pm index d36ceaf4..c353b0e3 100644 --- a/modules/Options.pm +++ b/modules/Options.pm @@ -274,7 +274,9 @@ sub options { elsif ($arg eq '-exclude') { $i++; if (defined $args[$i]) { - @exclude = split(',', $args[$i]); + foreach my $exclude (split(',', $args[$i])) { + push(@exclude, DirectoryManager::mpc_glob(undef, $args[$i])); + } } else { $self->optionError('-exclude requires a ' . diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 5b2953c8..36a44c0d 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -1928,6 +1928,42 @@ sub get_pre_keyword_array { } +sub add_explicit_output { + my($self) = shift; + my($file) = shift; + my($type) = shift; + my($tag) = shift; + my($array) = shift; + + if (defined $self->{'valid_components'}->{$tag} && + defined $self->{'custom_special_output'}->{$type} && + defined $self->{'custom_special_output'}->{$type}->{$file}) { + my(@files) = (); + foreach my $check (@{$self->{'custom_special_output'}->{$type}->{$file}}) { + foreach my $regext (@{$self->{'valid_components'}->{$tag}}) { + if ($check =~ /$regext$/) { + my($add) = 1; + if ($tag eq 'source_files') { + foreach my $tregext (@{$self->{'valid_components'}->{'template_files'}}) { + if ($check =~ /$tregext$/) { + $add = undef; + last; + } + } + } + if ($add) { + push(@files, $check); + last; + } + } + } + } + if (defined $files[0]) { + push(@$array, \@files); + } + } +} + sub generated_filename_arrays { my($self) = shift; my($part) = shift; @@ -2007,6 +2043,7 @@ sub generated_filename_arrays { } } + $self->add_explicit_output($file, $type, $tag, \@array); return @array; } @@ -2779,11 +2816,11 @@ sub prepend_gendir { if (defined $key) { foreach my $ma (@{$self->{'matching_assignments'}->{$gentype}}) { if ($ma eq 'gendir') { - if (defined $self->{'flag_overrides'}->{$gentype}->{$key}->{$ma}) { + my($dir) = $self->{'flag_overrides'}->{$gentype}->{$key}->{$ma}; + if (defined $dir) { ## Convert the file to unix style for basename $created =~ s/\\/\//g; - return "$self->{'flag_overrides'}->{$gentype}->{$key}->{$ma}/" . - basename($created); + return ($dir eq '.' ? '' : "$dir/") . basename($created); } } } @@ -4137,7 +4174,15 @@ sub adjust_value { ## or overrides for the template values. foreach my $name (@$names) { if (defined $name && defined $atemp->{lc($name)}) { + my($base) = $name; + $base =~ s/.*:://; + my($replace) = (defined $self->{'valid_names'}->{$base} && + ($self->{'valid_names'}->{$base} & 0x04) == 0); foreach my $val (@{$atemp->{lc($name)}}) { + if ($replace && $$val[1] =~ /<%/) { + $$val[1] = $self->replace_parameters($$val[1], + $self->{'command_subs'}); + } my($arr) = $self->create_array($$val[1]); if ($$val[0] > 0) { if (!defined $value) { diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm index b37edb8e..954d9514 100644 --- a/modules/TemplateParser.pm +++ b/modules/TemplateParser.pm @@ -1710,6 +1710,7 @@ sub parse_line { } } } + last if (!$status); } } else { diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index b5dc7714..e20c32cc 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -266,12 +266,16 @@ sub parse_line { } } elsif ($status == -1) { - if ($line =~ /\.$wsext$/) { - ($status, $error) = $self->aggregated_workspace($line); - } - else { - push(@{$self->{'project_files'}}, $line); - $status = 1; + foreach my $expfile ($line =~ /[\?\*\[\]]/ ? $self->mpc_glob($line) : + $line) { + if ($expfile =~ /\.$wsext$/) { + ($status, $error) = $self->aggregated_workspace($expfile); + last if (!$status); + } + else { + push(@{$self->{'project_files'}}, $expfile); + $status = 1; + } } } @@ -420,10 +424,18 @@ sub parse_exclude { last; } else { + if ($line =~ /^"([^"]+)"$/) { + $line = $1; + } if (defined $self->{'scoped_basedir'}) { $line = $self->{'scoped_basedir'} . '/' . $line; } - push(@exclude, $line); + if ($line =~ /[\?\*\[\]]/) { + push(@exclude, $self->mpc_glob($line)); + } + else { + push(@exclude, $line); + } } } @@ -583,19 +595,23 @@ sub handle_scoped_unknown { } } else { - if ($line =~ /\.$wsext$/) { - ## An aggregated workspace within an aggregated workspace. - ($status, $error) = $self->aggregated_workspace($line); - } - else { - if (!$self->excluded($line)) { - if (defined $dupchk && exists $$dupchk{$line}) { - $self->warning("Duplicate mpc file ($line) added by an " . - 'aggregate workspace. It will be ignored.'); - } - else { - $self->{'scoped_assign'}->{$line} = $flags; - push(@{$self->{'project_files'}}, $line); + foreach my $expfile ($line =~ /[\?\*\[\]]/ ? $self->mpc_glob($line) : + $line) { + if ($expfile =~ /\.$wsext$/) { + ## An aggregated workspace within an aggregated workspace. + ($status, $error) = $self->aggregated_workspace($expfile); + last if (!$status); + } + else { + if (!$self->excluded($expfile)) { + if (defined $dupchk && exists $$dupchk{$expfile}) { + $self->warning("Duplicate mpc file ($expfile) added by an " . + 'aggregate workspace. It will be ignored.'); + } + else { + $self->{'scoped_assign'}->{$expfile} = $flags; + push(@{$self->{'project_files'}}, $expfile); + } } } } diff --git a/templates/bmake.mpd b/templates/bmake.mpd index 39c7b83f..0be2a5a8 100644 --- a/templates/bmake.mpd +++ b/templates/bmake.mpd @@ -8,7 +8,7 @@ <%marker(top)%> <%foreach(configurations)%> !ifdef <%uc(configuration)%> -OCFLAGS = <%if(optimize)%>-O2<%else%>-v -y -Od -vi- -k<%endif%><%foreach(defines debug_macros)%> -D<%define%><%endfor%> +OCFLAGS = <%if(optimize)%>-O2<%else%><%if(debug_prj)%>-v -y -Od -vi- -k<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%> CFG_DIR = <%intermediate_dir%>\\ ILIBMODIFIER = <%lib_modifier%> OLIBMODIFIER = <%if(use_lib_modifier)%><%lib_modifier%><%endif%> diff --git a/templates/bmakedll.mpt b/templates/bmakedll.mpt index 3f66d039..5d5cf40d 100644 --- a/templates/bmakedll.mpt +++ b/templates/bmakedll.mpt @@ -15,6 +15,7 @@ Release { Debug { optimize = + debug_prj = 1 defines = _DEBUG intermediate_dir = Debug lib_modifier = d diff --git a/templates/bmakedllexe.mpt b/templates/bmakedllexe.mpt index c7ed6ce2..9d12f62f 100644 --- a/templates/bmakedllexe.mpt +++ b/templates/bmakedllexe.mpt @@ -16,6 +16,7 @@ Release { Debug { optimize = + debug_prj = 1 defines = _DEBUG exeoutputdir = . intermediate_dir = Debug diff --git a/templates/bmakelib.mpt b/templates/bmakelib.mpt index 4bb8b993..96aa3188 100644 --- a/templates/bmakelib.mpt +++ b/templates/bmakelib.mpt @@ -14,6 +14,7 @@ Release { Debug { optimize = + debug_prj = 1 defines = _DEBUG intermediate_dir = Static_Debug lib_modifier = sd diff --git a/templates/bmakelibexe.mpt b/templates/bmakelibexe.mpt index 3484884e..846a388e 100644 --- a/templates/bmakelibexe.mpt +++ b/templates/bmakelibexe.mpt @@ -17,6 +17,7 @@ Release { Debug { optimize = + debug_prj = 1 defines = _DEBUG exeoutputdir = Static_Debug intermediate_dir = Static_Debug diff --git a/templates/em3.mpd b/templates/em3.mpd index 20dec232..d26819d3 100644 --- a/templates/em3.mpd +++ b/templates/em3.mpd @@ -3,7 +3,7 @@ # ** DO NOT EDIT ** <%foreach(platforms)%> -# TARGTYPE "<%operating_system("Win32")%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%>" <%type_code%><%else%>Generic Project" 0x010a<%endif%> +# TARGTYPE "<%operating_system("Win32")%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%><%else%>Dynamic-Link Library<%endif%>" <%type_code%> <%endfor%> CFG=<%project_name%> - <%operating_system("Win32")%> (<%default_platform%>) <%default_configuration%> @@ -22,7 +22,7 @@ CFG=<%project_name%> - <%operating_system("Win32")%> (<%default_platform%>) <%de !MESSAGE <%foreach(platforms)%> <%foreach(configurations)%> -!MESSAGE "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>" (based on "<%operating_system%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%><%else%>Generic Project<%endif%>") +!MESSAGE "<%project_name%> - <%operating_system%> (<%platform%>) <%configuration%>" (based on "<%operating_system%> (<%platform%>) <%if(exename || sharedname || staticname)%><%if(type_is_static && staticname)%>Static Library<%else%><%type_description%><%endif%><%else%>Dynamic-Link Library<%endif%>") <%endfor%> <%endfor%> !MESSAGE @@ -69,7 +69,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%libname_prefix%><%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe -# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%><%if(link_options)%> <%link_options%><%endif%> /INCREMENTAL:<%incremental("NO")%> <%foreach(reverse(libs))%><%libname_prefix%><%lib%><%lib_modifier%><%lib_ext%> <%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib <%endfor%><%foreach(reverse(pure_libs))%><%pure_lib%> <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%if(type_is_dynamic)%> /implib:"<%libout%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)"<%if(win_version)%> /version:<%win_version%><%endif%><%if(StackReserveSize)%> /stack:<%StackReserveSize%><%if(StackCommitSize)%>,<%StackCommitSize%><%endif%><%endif%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdbl)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%else%> /pdb:none<%endif%> <%if(type_is_dynamic)%> <%if(!source_files)%>/noentry <%endif%>/dll<%endif%> <%if(unicode && unicode_mfc_entry && exename && source_files)%>/entry:"<%unicode_mfc_entry%>" <%endif%><%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>" +# ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%><%if(link_options)%> <%link_options%><%endif%> /INCREMENTAL:<%incremental("NO")%> <%foreach(reverse(libs))%><%libname_prefix%><%lib%><%lib_modifier%><%lib_ext%> <%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib <%endfor%><%foreach(reverse(pure_libs))%><%pure_lib%> <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%if(type_is_dynamic)%> /implib:"<%libout%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)<%foreach(ignore_libs)%>,<%ignore_lib%><%endfor%>"<%if(win_version)%> /version:<%win_version%><%endif%><%if(StackReserveSize)%> /stack:<%StackReserveSize%><%if(StackCommitSize)%>,<%StackCommitSize%><%endif%><%endif%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdbl)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>.pdb"<%endif%><%endif%><%else%> /pdb:none<%endif%> <%if(type_is_dynamic)%> <%if(!source_files)%>/noentry <%endif%>/dll<%endif%> <%if(unicode && unicode_mfc_entry && exename && source_files)%>/entry:"<%unicode_mfc_entry%>" <%endif%><%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>" <%if(link_flags_removed)%> # SUBTRACT LINK32 <%link_flags_removed%> <%endif%> @@ -111,7 +111,7 @@ SOURCE="<%pch_source%>" <%endif%> <%endif%> <%if(grouped_source_files)%> -<%foreach(grouped_source_files)%> +<%foreach(sort(grouped_source_files))%> # Begin Group "<%grouped_source_file%>" # PROP Default_Filter "" @@ -162,7 +162,7 @@ SOURCE="<%pch_header%>" # End Source File <%endif%> <%if(grouped_header_files)%> -<%foreach(grouped_header_files)%> +<%foreach(sort(grouped_header_files))%> # Begin Group "<%grouped_header_file%>" # PROP Default_Filter "" @@ -189,7 +189,7 @@ SOURCE="<%header_file%>" # PROP Default_Filter "i;inl" <%if(grouped_inline_files)%> -<%foreach(grouped_inline_files)%> +<%foreach(sort(grouped_inline_files))%> # Begin Group "<%grouped_inline_file%>" # PROP Default_Filter "" @@ -216,7 +216,7 @@ SOURCE="<%inline_file%>" # PROP Default_Filter "" <%if(grouped_template_files)%> -<%foreach(grouped_template_files)%> +<%foreach(sort(grouped_template_files))%> # Begin Group "<%grouped_template_file%>" # PROP Default_Filter "" @@ -245,7 +245,7 @@ SOURCE="<%template_file%>" # PROP Default_Filter "" <%if(grouped_documentation_files)%> -<%foreach(grouped_documentation_files)%> +<%foreach(sort(grouped_documentation_files))%> # Begin Group "<%grouped_documentation_file%>" # PROP Default_Filter "" @@ -272,7 +272,7 @@ SOURCE="<%documentation_file%>" # PROP Default_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))%> # Begin Group "<%grouped_resource_file%>" # PROP Default_Filter "" diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt index b8f90ddf..b97d2217 100644 --- a/templates/em3vcpdll.mpt +++ b/templates/em3vcpdll.mpt @@ -19,6 +19,8 @@ WCE x86 { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE emulator { @@ -27,6 +29,8 @@ WCE emulator { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE ARM { diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt index ccd66452..64168c38 100644 --- a/templates/em3vcpdllexe.mpt +++ b/templates/em3vcpdllexe.mpt @@ -19,6 +19,8 @@ WCE x86 { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE emulator { @@ -27,6 +29,8 @@ WCE emulator { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE ARM { diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt index 8d2e35c4..385aa1ee 100644 --- a/templates/em3vcplibexe.mpt +++ b/templates/em3vcplibexe.mpt @@ -19,6 +19,8 @@ WCE x86 { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE emulator { @@ -27,6 +29,8 @@ WCE emulator { platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA machine = IX86 cpu_defines = _i386_ _X86_ x86 + ignore_libs = OLDNAMES.lib + pure_libs += $(CEx86Corelibc) } WCE ARM { diff --git a/templates/vc6.mpd b/templates/vc6.mpd index 152fc050..e706fed6 100644 --- a/templates/vc6.mpd +++ b/templates/vc6.mpd @@ -102,7 +102,7 @@ SOURCE="<%pch_source%>" <%endif%> <%endif%> <%if(grouped_source_files)%> -<%foreach(grouped_source_files)%> +<%foreach(sort(grouped_source_files))%> # Begin Group "<%grouped_source_file%>" # PROP Default_Filter "" @@ -149,7 +149,7 @@ SOURCE="<%pch_header%>" # End Source File <%endif%> <%if(grouped_header_files)%> -<%foreach(grouped_header_files)%> +<%foreach(sort(grouped_header_files))%> # Begin Group "<%grouped_header_file%>" # PROP Default_Filter "" @@ -176,7 +176,7 @@ SOURCE="<%header_file%>" # PROP Default_Filter "i;inl" <%if(grouped_inline_files)%> -<%foreach(grouped_inline_files)%> +<%foreach(sort(grouped_inline_files))%> # Begin Group "<%grouped_inline_file%>" # PROP Default_Filter "" @@ -203,7 +203,7 @@ SOURCE="<%inline_file%>" # PROP Default_Filter "" <%if(grouped_template_files)%> -<%foreach(grouped_template_files)%> +<%foreach(sort(grouped_template_files))%> # Begin Group "<%grouped_template_file%>" # PROP Default_Filter "" @@ -232,7 +232,7 @@ SOURCE="<%template_file%>" # PROP Default_Filter "" <%if(grouped_documentation_files)%> -<%foreach(grouped_documentation_files)%> +<%foreach(sort(grouped_documentation_files))%> # Begin Group "<%grouped_documentation_file%>" # PROP Default_Filter "" @@ -259,7 +259,7 @@ SOURCE="<%documentation_file%>" # PROP Default_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))%> # Begin Group "<%grouped_resource_file%>" # PROP Default_Filter "" diff --git a/templates/vc7.mpd b/templates/vc7.mpd index c76034f4..c9761d49 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -203,7 +203,7 @@ </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 @@ -272,7 +272,7 @@ </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 @@ -345,7 +345,7 @@ 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 @@ -378,7 +378,7 @@ 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 @@ -435,7 +435,7 @@ 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 @@ -492,7 +492,7 @@ 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 diff --git a/templates/vc8.mpd b/templates/vc8.mpd index eb862e47..000fbbba 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -511,7 +511,7 @@ </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 @@ -586,7 +586,7 @@ </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 @@ -661,7 +661,7 @@ 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 @@ -694,7 +694,7 @@ 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 @@ -757,7 +757,7 @@ 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 @@ -820,7 +820,7 @@ 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 |