ChangeLogTag: Thu Mar 9 16:20:24 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

author: elliott_c <ocielliottc@users.noreply.github.com> 2006-03-09 16:21:18 +0000
committer: elliott_c <ocielliottc@users.noreply.github.com> 2006-03-09 16:21:18 +0000
commit: 3fec7bfedb10c9c99448ee03d4ea1f398ec165f6 (patch)
tree: 7b2794f032385277de3c3018ed084d2115d6dc66
parent: a3717a1908096b14a4cacb951e92999aa4216216 (diff)
download: MPC-3fec7bfedb10c9c99448ee03d4ea1f398ec165f6.tar.gz
31 files changed, 115 insertions, 484 deletions
diff --git a/ChangeLog b/ChangeLog
index a90c84a8..31ef3ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+Thu Mar  9 16:20:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/CBXProjectCreator.pm:
+        * modules/CBXWorkspaceCreator.pm:
+        * templates/cbx.mpd:
+        * templates/cbxdll.mpt:
+        * templates/cbxexe.mpt:
+
+          Removed these files.
+
+        * USAGE:
+        * config/boost_date_time.mpb:
+        * config/boost_filesystem.mpb:
+        * config/boost_iostreams.mpb:
+        * config/boost_prg_exec_monitor.mpb:
+        * config/boost_program_options.mpb:
+        * config/boost_regex.mpb:
+        * config/boost_serialization.mpb:
+        * config/boost_signals.mpb:
+        * config/boost_test_exec_monitor.mpb:
+        * config/boost_thread.mpb:
+        * config/boost_wave.mpb:
+        * config/xerces.mpb:
+        * modules/MPC.pm:
+        * modules/MWC.pm:
+
+          Removed the cbx project type.  The format is dead and has been
+          replaced by the bds format.
+
+        * README:
+        * templates/bmake.mpd:
+        * templates/html.mpd:
+        * templates/make.mpd:
+        * templates/nmake.mpd:
+        * templates/vc7.mpd:
+        * templates/vc8.mpd:
+        * modules/ProjectCreator.pm:
+
+          Added partial support for prebuild.  Some project types can't or
+          can't easily support this concept.
+
+        * modules/DirectoryManager.pm:
+        * modules/WinProjectBase.pm:
+
+          Moved a portion of the code to remove the current working
+          directory from WinProjectBase's version of translate_directory()
+          into DirectoryManager's version.
+
 Mon Mar  6 18:09:36 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * config/qt.mpb:
diff --git a/README b/README
index 9de93900..264ddd8d 100644
--- a/README
+++ b/README
@@ -176,6 +176,8 @@ postbuild       If this is defined in the project, the value will be
                   <%and%>   - Project non-specific and sign.
                   <%or%>    - Project non-specific or sign.
                   <%quote%> - Project non-specific double quote.
+prebuild        This is similar to postbuild except that it will be
+                performed before the build instead of after.
 
 recurse         If set to 1, MPC will recurse into directories listed under
                 component listings and add any component corresponding files
diff --git a/USAGE b/USAGE
index 0184a238..67ba7831 100644
--- a/USAGE
+++ b/USAGE
@@ -21,9 +21,9 @@ Usage: mwc.pl [-global <file>] [-include <directory>] [-recurse]
               [-apply_project] [-version] [-into <directory>]
               [-gfeature_file <file name>]
               [-language <cplusplus | csharp | java | vb>]
-              [-type <automake | bds | bmake | cbx | em3 | ghs |
-                      html | make | nmake | sle | vc6 | vc7 |
-                      vc71 | vc8>]
+              [-type <automake | bds | bmake | em3 | ghs | html |
+                      make | nmake | sle | vc6 | vc7 | vc71 |
+                      vc8>]
               [files]
 
        -base           Add <project> as a base project to each generated
diff --git a/config/boost_date_time.mpb b/config/boost_date_time.mpb
index ebf84bca..8413a74a 100644
--- a/config/boost_date_time.mpb
+++ b/config/boost_date_time.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_date_time$(BOOST_CFG)
   }
 }
diff --git a/config/boost_filesystem.mpb b/config/boost_filesystem.mpb
index 68ff90a7..829c5d0e 100644
--- a/config/boost_filesystem.mpb
+++ b/config/boost_filesystem.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_filesystem$(BOOST_CFG)
   }
 }
diff --git a/config/boost_iostreams.mpb b/config/boost_iostreams.mpb
index 1a2a3718..81a7c814 100644
--- a/config/boost_iostreams.mpb
+++ b/config/boost_iostreams.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_iostreams$(BOOST_CFG)
   }
 }
diff --git a/config/boost_prg_exec_monitor.mpb b/config/boost_prg_exec_monitor.mpb
index 5105b586..08302782 100644
--- a/config/boost_prg_exec_monitor.mpb
+++ b/config/boost_prg_exec_monitor.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_prg_exec_monitor$(BOOST_CFG)
   }
 }
diff --git a/config/boost_program_options.mpb b/config/boost_program_options.mpb
index 84c87816..f29b1efa 100644
--- a/config/boost_program_options.mpb
+++ b/config/boost_program_options.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_program_options$(BOOST_CFG)
   }
 }
diff --git a/config/boost_regex.mpb b/config/boost_regex.mpb
index d140dda8..9a909171 100644
--- a/config/boost_regex.mpb
+++ b/config/boost_regex.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_regex$(BOOST_CFG)
   }
 }
diff --git a/config/boost_serialization.mpb b/config/boost_serialization.mpb
index 6dfe9056..1a3ccb69 100644
--- a/config/boost_serialization.mpb
+++ b/config/boost_serialization.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_serialization$(BOOST_CFG)
   }
 }
diff --git a/config/boost_signals.mpb b/config/boost_signals.mpb
index dd04fa3d..f9704f01 100644
--- a/config/boost_signals.mpb
+++ b/config/boost_signals.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_signals$(BOOST_CFG)
   }
 }
diff --git a/config/boost_test_exec_monitor.mpb b/config/boost_test_exec_monitor.mpb
index 0bb2ae5d..eb7f3f48 100644
--- a/config/boost_test_exec_monitor.mpb
+++ b/config/boost_test_exec_monitor.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_test_exec_monitor$(BOOST_CFG)
   }
 }
diff --git a/config/boost_thread.mpb b/config/boost_thread.mpb
index 1f7e2695..a1464295 100644
--- a/config/boost_thread.mpb
+++ b/config/boost_thread.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_thread$(BOOST_CFG)
   }
 }
diff --git a/config/boost_wave.mpb b/config/boost_wave.mpb
index 395af79e..e3d88190 100644
--- a/config/boost_wave.mpb
+++ b/config/boost_wave.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project: boost_base {
-  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !cbx) {
+  specific(!vc6, !vc7, !vc71, !vc8, !nmake, !em3, !bmake, !bds) {
     lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_wave$(BOOST_CFG)
   }
 }
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 8d8620e4..91406fde 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -14,7 +14,7 @@ project {
     // will link in the debug version for the "Debug" configuration.
     Debug::xerceslib = xerces-c_2D
   }
-  specific(borland, bmake, cbx) {
+  specific(borland, bmake, bds) {
     xerceslib = XercesLib
   }
   specific (gnuace, make, sle, automake, ghs) {
diff --git a/modules/CBXProjectCreator.pm b/modules/CBXProjectCreator.pm
deleted file mode 100644
index 4b6478df..00000000
--- a/modules/CBXProjectCreator.pm
+++ /dev/null
@@ -1,50 +0,0 @@
-package CBXProjectCreator;
-
-# ************************************************************
-# Description   : The Borland C++ BuilderX Project Creator
-# Author        : Johnny Willemsen
-# Create Date   : 10/12/2003
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-
-use ProjectCreator;
-use WinProjectBase;
-use XMLProjectBase;
-
-use vars qw(@ISA);
-@ISA = qw(XMLProjectBase WinProjectBase ProjectCreator);
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-sub crlf {
-  #my($self) = shift;
-  return "\n";
-}
-
-
-sub project_file_extension {
-  #my($self) = shift;
-  return '.cbx';
-}
-
-
-sub get_dll_exe_template_input_file {
-  #my($self) = shift;
-  return 'cbxexe';
-}
-
-
-sub get_dll_template_input_file {
-  #my($self) = shift;
-  return 'cbxdll';
-}
-
-
-1;
diff --git a/modules/CBXWorkspaceCreator.pm b/modules/CBXWorkspaceCreator.pm
deleted file mode 100644
index 33d243af..00000000
--- a/modules/CBXWorkspaceCreator.pm
+++ /dev/null
@@ -1,65 +0,0 @@
-package CBXWorkspaceCreator;
-
-# ************************************************************
-# Description   : A CBX Workspace Creator
-# Author        : Chad Elliott
-# Create Date   : 2/06/2004
-# ************************************************************
-
-# ************************************************************
-# Pragmas
-# ************************************************************
-
-use strict;
-
-use CBXProjectCreator;
-use WorkspaceCreator;
-
-use vars qw(@ISA);
-@ISA = qw(WorkspaceCreator);
-
-# ************************************************************
-# Subroutine Section
-# ************************************************************
-
-
-sub compare_output {
-  #my($self) = shift;
-  return 1;
-}
-
-
-sub workspace_file_name {
-  my($self) = shift;
-  return $self->get_modified_workspace_name($self->get_workspace_name(),
-                                            '.bpgr');
-}
-
-
-sub pre_workspace {
-  my($self) = shift;
-  my($fh)   = shift;
-  my($crlf) = $self->crlf();
-
-  print $fh '<?xml version="1.0" encoding="UTF-8"?>', $crlf,
-            '<!-- $Id$ -->', $crlf,
-            '<!-- MPC Command -->', $crlf,
-            "<!-- $0 @ARGV -->", $crlf;
-}
-
-
-sub write_comps {
-  my($self) = shift;
-  my($fh)   = shift;
-  my($crlf) = $self->crlf();
-
-  print $fh '<!--Project Group-->', $crlf,
-            '<projectgroup>', $crlf;
-  foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
-    print $fh "  <project path=\"$project\"/>$crlf";
-  }
-  print $fh "</projectgroup>$crlf";
-}
-
-
-1;
diff --git a/modules/DirectoryManager.pm b/modules/DirectoryManager.pm
index c91e1848..d2058a3c 100644
--- a/modules/DirectoryManager.pm
+++ b/modules/DirectoryManager.pm
@@ -152,14 +152,25 @@ sub mpc_glob {
 sub translate_directory {
   my($self) = shift;
   my($dir)  = shift;
-  my($dd)   = 'dotdot';
 
+  ## Remove the current working directory from $dir (if it is contained)
+  my($cwd) = $self->getcwd();
+  $cwd =~ s/\//\\/g if ($self->convert_slashes());
+  if (index($dir, $cwd) == 0) {
+    my($cwdl) = length($cwd);
+    return '.' if (length($dir) == $cwdl);
+    $dir = substr($dir, $cwdl + 1);
+  }
+
+  ## Translate .. to $dd
   if (index($dir, '..') >= 0) {
+    my($dd) = 'dotdot';
     $dir =~ s/^\.\.([\/\\])/$dd$1/;
     $dir =~ s/([\/\\])\.\.$/$1$dd/;
     $dir =~ s/([\/\\])\.\.([\/\\])/$1$dd$2/g;
     $dir =~ s/^\.\.$/$dd/;
   }
+
   return $dir;
 }
 
diff --git a/modules/MPC.pm b/modules/MPC.pm
index e7e3a227..9df0aab1 100644
--- a/modules/MPC.pm
+++ b/modules/MPC.pm
@@ -25,7 +25,6 @@ sub new {
                                       'VC7ProjectCreator',
                                       'VC71ProjectCreator',
                                       'VC8ProjectCreator',
-                                      'CBXProjectCreator',
                                       'BDSProjectCreator',
                                       'GHSProjectCreator',
                                       'EM3ProjectCreator',
diff --git a/modules/MWC.pm b/modules/MWC.pm
index f1800aaa..0d6f6755 100644
--- a/modules/MWC.pm
+++ b/modules/MWC.pm
@@ -25,7 +25,6 @@ sub new {
                                       'VC7WorkspaceCreator',
                                       'VC71WorkspaceCreator',
                                       'VC8WorkspaceCreator',
-                                      'CBXWorkspaceCreator',
                                       'BDSWorkspaceCreator',
                                       'GHSWorkspaceCreator',
                                       'EM3WorkspaceCreator',
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index cf9faec2..e130c9c6 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -51,6 +51,7 @@ my(%validNames) = ('exename'         => 1,
                    'pure_libs'       => 2,
                    'pch_header'      => 1,
                    'pch_source'      => 1,
+                   'prebuild'        => 5,
                    'postbuild'       => 5,
                    'dllout'          => 1,
                    'libout'          => 1,
diff --git a/modules/WinProjectBase.pm b/modules/WinProjectBase.pm
index 24c33707..08ae89ba 100644
--- a/modules/WinProjectBase.pm
+++ b/modules/WinProjectBase.pm
@@ -41,14 +41,6 @@ sub translate_directory {
   ## Call the base class version
   $dir = $self->DirectoryManager::translate_directory($dir);
 
-  ## Remove the current working directory from $dir (if it is contained)
-  my($cwd)  = $self->getcwd();
-  my($cwdl) = length($cwd);
-  $cwd =~ s/\//\\/g;
-  if (index($dir, $cwd) == 0) {
-    $dir = substr($dir, $cwdl + 1);
-  }
-
   ## Change drive letters and $() macros
   $dir =~ s/^([A-Z]):/$1/i;
   $dir =~ s/\$\(([^\)]+)\)/$1/g;
@@ -60,7 +52,7 @@ sub translate_directory {
   my($maxenv) = $ENV{$max_win_env};
   my($maxlen) = (defined $maxenv && $maxenv =~ /^\d+$/ ? $maxenv : 128) + 3;
   my($dirlen) = length($dir);
-  my($diff)   = ($cwdl + $dirlen + 1) - $maxlen;
+  my($diff)   = (length($self->getcwd()) + $dirlen + 1) - $maxlen;
 
   if ($diff > 0) {
     if ($diff > $dirlen) {
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
index 301a65be..8fa9eebb 100644
--- a/templates/bmake.mpd
+++ b/templates/bmake.mpd
@@ -172,7 +172,7 @@ CFLAGS = \
 <%marker(macros)%>
 <%if(exename)%>
 OUTPUTDIR = <%if(install)%><%install%>\\<%else%>$(EXEOUTPUTDIR)<%endif%>
-all: $(OUTPUTDIR)$(NAME)$(EXE_EXT)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(EXE_EXT)<%if(postbuild)%> __postbuild__<%endif%>
 
 $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
 	@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
@@ -183,7 +183,7 @@ $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
 <%endif%>
 <%if(sharedname)%>
 OUTPUTDIR = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\\
-all: $(OUTPUTDIR)$(NAME)$(DLL_EXT)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(DLL_EXT)<%if(postbuild)%> __postbuild__<%endif%>
 
 $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
 	@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
@@ -194,7 +194,7 @@ $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
 <%endif%>
 <%if(type_is_static && staticname)%>
 OUTPUTDIR = <%libout%>\\
-all: $(OUTPUTDIR)$(NAME)$(LIB_EXT)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(LIB_EXT)<%if(postbuild)%> __postbuild__<%endif%>
 
 $(OUTPUTDIR)$(NAME)$(LIB_EXT): $(OBJFILES)
 	@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
@@ -205,7 +205,7 @@ $(OUTPUTDIR)$(NAME)$(LIB_EXT): $(OBJFILES)
 
 <%endif%>
 <%if(!exename && !sharedname && !staticname)%>
-all:<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%><%if(postbuild)%> __postbuild__<%endif%>
 	@-rem
 
 <%endif%>
@@ -250,10 +250,10 @@ PATH = $(PATH);<%custom_type->libpath%>
 <%if(source_files)%>
 $(OBJFILES): $(GENERATED_DIRTY)
 <%else%>
-all: $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
 <%endif%>
 <%else%>
-all: $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
 <%endif%>
 
 <%endif%>
@@ -343,6 +343,11 @@ realclean: clean
         -if exist "$(OUTPUTDIR)$(NAME)$(POSTLINKRM)" del "$(OUTPUTDIR)$(NAME)$(POSTLINKRM)"
 <%endif%>
 
+<%if(prebuild)%>
+__prebuild__:
+	@<%eval(prebuild)%>
+
+<%endif%>
 <%if(postbuild)%>
 __postbuild__:
 	@<%eval(postbuild)%>
diff --git a/templates/cbx.mpd b/templates/cbx.mpd
deleted file mode 100644
index 42d76566..00000000
--- a/templates/cbx.mpd
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--C++Builder MP Project-->
-<project>
-  <property category="build.config" name="active" value="0"/>
-  <property category="build.config" name="count" value="1"/>
-  <property category="build.config" name="excludedefaultforzero" value="0"/>
-  <property category="build.config.0" name="builddir" value="Debug"/>
-  <property category="build.config.0" name="key" value="Debug_Build"/>
-  <property category="build.config.0" name="linux.builddir" value="linux/Debug_Build"/>
-  <property category="build.config.0" name="name" value="Debug Build"/>
-  <property category="build.config.0" name="settings.MinGW" value="default;debug"/>
-  <property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
-  <property category="build.config.0" name="settings.mswin32" value="default;debug"/>
-  <property category="build.config.0" name="solaris.builddir" value="solaris/Debug_Build"/>
-  <property category="build.config.0" name="type" value="Toolset"/>
-  <property category="build.config.0" name="win32.builddir" value="windows/Debug_Build"/>
-  <property category="build.config.1" name="key" value="Release_Build"/>
-  <property category="build.config.1" name="name" value="Release Build"/>
-  <property category="build.config.1" name="settings.MinGW" value="default;release"/>
-  <property category="build.config.1" name="settings.gnuc++" value="default;release"/>
-  <property category="build.config.1" name="settings.mswin32" value="default;release"/>
-  <property category="build.config.1" name="type" value="Toolset"/>
-  <property category="build.node" name="type" value="libraryproject"/>
-  <property category="build.platform" name="active" value="win32"/>
-  <property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
-  <property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
-  <property category="build.platform" name="linux.default" value="gnuc++"/>
-  <property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
-  <property category="build.platform" name="solaris.Debug_Build.toolset" value="sunforte"/>
-  <property category="build.platform" name="solaris.Release_Build.toolset" value="sunforte"/>
-  <property category="build.platform" name="solaris.default" value="gnuc++"/>
-  <property category="build.platform" name="solaris.gnuc++.enabled" value="1"/>
-  <property category="build.platform" name="solaris.sunforte.enabled" value="1"/>
-  <property category="build.platform" name="win32.CygWin.enabled" value="1"/>
-  <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>
-  <property category="build.platform" name="win32.MinGW.enabled" value="1"/>
-  <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>
-  <property category="build.platform" name="win32.default" value="win32b"/>
-  <property category="build.platform" name="win32.gnuc++.enabled" value="0"/>
-  <property category="build.platform" name="win32.mswin32.enabled" value="1"/>
-  <property category="build.platform" name="win32.win32b.enabled" value="1"/>
-  <property category="cbproject" name="lastnodeid" value="317"/>
-  <property category="cbproject" name="version" value="1.6"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="\usr\include"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="\usr\include\g++-3"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++link" name="option.g.arg" value="2"/>
-  <property category="linux.Debug_Build.gnuc++.g++link" name="option.g.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
-  <property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
-  <property category="runtime" name="ExcludeDefaultForZero" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_c_compile" name="option.o.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_c_link" name="option.o.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_Bdynamic.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_c.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_compat=5.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_dy.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_fns=no.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_fround=nearest.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_ftrap.arg.1" value="%none"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_ftrap.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_g.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_instances=global.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_o.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_staticlib.arg.1" value="%none"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_staticlib.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_template.arg.1" value="no%wholeclass,extdef"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_template.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_verbose.arg.1" value="%none"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_verbose.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xalias_level=any.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xarch=generic.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xbuiltin=%none.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xcheck=%none.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xcrossfile=0.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xinline.arg.1" value="%auto"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xinline.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xopenmp=none.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xprefetch.arg.1" value="no%auto,explicit"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_compile" name="option.minus_xprefetch.enabled" value="1"/>
-  <property category="solaris.Debug_Build.sunforte.forte_cpp_link" name="option.minus_o.enabled" value="1"/>
-  <property category="solaris.sunforte.Debug_Build" name="saved" value="1"/>
-  <property category="win32.Debug_Build.CygWin.dlltool_def" name="option.export-all.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.dlltool_def" name="option.output-def.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.dlltool_lib" name="option.output-lib.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.o.enabled" value="1"/>
-<%foreach(defines common_defines macros)%>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.D_MACRO_VALUE.arg.<%forcount%>" value="<%define%>"/>
-<%endfor%>
-<%foreach(includes)%>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.I.arg.<%forcount%>" value="<%include%>"/>
-<%endfor%>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.I.arg.merge" value="1"/>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.I.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.g++compile" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.g++link" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.CygWin.windres" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.dlltool_def" name="option.export-all.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.dlltool_def" name="option.output-def.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.dlltool_lib" name="option.dllname.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.dlltool_lib" name="option.input-def.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.dlltool_lib" name="option.output-lib.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.B.arg.1" value="$(BCBX)\MinGW\bin"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.B.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.I.arg.1" value="$(BCBX)\mingw\include"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.I.arg.2" value="$(BCBX)\mingw\include\c++\3.2"/>
-<%foreach(includes)%>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.I.arg.3" value="<%include%>"/>
-<%endfor%>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.I.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.MD.enabled" value="1"/>
-<%foreach(defines common_defines macros)%>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.D_MACRO_VALUE.arg.<%forcount%>" value="<%define%>"/>
-<%endfor%>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.D_MACRO_VALUE.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.O0.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.c.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.g.arg" value="2"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.g.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="param.additionalflags" value="-mthreads"/>
-  <property category="win32.Debug_Build.MinGW.g++compile" name="param.additionalflags.merge" value="0"/>
-  <property category="win32.Debug_Build.MinGW.g++link" name="option.B.arg.1" value="$(BCBX)\MinGW\bin"/>
-  <property category="win32.Debug_Build.MinGW.g++link" name="option.B.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.g++link" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.MinGW.windres" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.1" value="SelectedWarnings"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.containerenabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.option.wccc.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.option.wpia.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.option.wrch.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.option.wrvl.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.2" value="_RTLDLL"/>
-<%if(type_is_dynamic)%>
-<%foreach(dynamicflags)%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.3" value="<%dynamicflag%>"/>
-<%endfor%>
-<%endif%>
-<%if(need_staticflags)%>
-<%foreach(staticflags)%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.3" value="<%libflag%>"/>
-<%endfor%>
-<%endif%>
-<%foreach(defines common_defines macros)%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.3" value="<%define%>"/>
-<%endfor%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.Hc.enabled" value="1"/>
-<%foreach(includes)%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.I.arg.<%forcount%>" value="<%include%>"/>
-<%endfor%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.I.arg.merge" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.I.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.V.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.VA.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.Ve.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.Vx.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.a8.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.b.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.o.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.batchfilecompile.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.c.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.g.arg" value="100"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.g.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.i.arg" value="250"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.i.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.j.arg" value="25"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.j.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.q.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.responsefile.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.tWM.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.tWR.enabled" value="1"/>
-<%if(type_is_dynamic)%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.tWD.enabled" value="1"/>
-<%endif%>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.w.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.brcc32" name="option.F.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Enn.arg" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Enn.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Gn.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.H:xxxx.arg" value="0x00100000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.H:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Hc:xxxx.arg" value="0x00001000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Hc:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.S:xxxx.arg" value="0x00100000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.S:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x00002000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Sc:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpe.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Ud.d.arg" value="1.0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Ud.d.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Vd.d.arg" value="0.0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Vd.d.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.b:xxxx.arg" value="0x00400000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.b:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32mti.lib"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpd.enabled" value="<%if(type_is_dynamic)%>1<%w%>0<%endif%>"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Tpe.enabled" value="<%if(type_is_dynamic)%>0<%else%>1<%endif%>"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Ud.d.arg" value="1.0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Ud.d.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Vd.d.arg" value="0.0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.Vd.d.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.b:xxxx.arg" value="0x00400000"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.b:xxxx.enabled" value="0"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="option.x.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.1" value="cw32mti.lib"/>
-  <property category="win32.Debug_Build.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>
-  <property category="win32.Debug_Build.win32b.tlib" name="option.P.arg" value="4096"/>
-  <property category="win32.Debug_Build.win32b.tlib" name="option.P.arg.merge" value="1"/>
-  <property category="win32.Debug_Build.win32b.tlib" name="option.P.enabled" value="1"/>
-  <property category="win32.Debug_Build.win32b.tlib" name="param.additionalflags.merge" value="1"/>
-  <property category="win32.win32b.Debug_Build" name="saved" value="1"/>
-  <property category="win32b.ilink32" name="enabled" value="0"/>
-<%if(source_files)%>
-  <node name="Source Files" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(source_files)%>
-      <file path="<%source_file%>">
-        <property category="unique" name="id"/>
-        <property category="win32.Debug_Build.win32b.bcc32" name="container.1" value="SelectedWarnings"/>
-        <property category="win32.Debug_Build.win32b.bcc32" name="container.SelectedWarnings.containerenabled" value="1"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%if(header_files)%>
-  <node name="Header files" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(header_files)%>
-      <file path="<%header_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%if(inline_files)%>
-  <node name="Inline files" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(inline_files)%>
-      <file path="<%inline_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%foreach(custom_types)%>
-<%if(custom_type->input_files)%>
-  <node name="<%custom_type%>" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(custom_type->input_files)%>
-      <file path="<%custom_type->input_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%endfor%>
-<%if(template_files)%>
-  <node name="Template files" type="Folder">
-    <property category="build.win32.Debug_Build.win32b" name="exclude" value="1"/>
-    <property category="build.linux.Debug_Build.gnuc++" name="exclude" value="1"/>
-    <property category="build.mac os.Debug_Build.gnuc++" name="exclude" value="1"/>
-    <property category="build.solaris.Debug_Build.sunforte70" name="exclude" value="1"/>
-    <property category="unique" name="id"/>
-<%foreach(template_files)%>
-      <file path="<%template_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%if(documentation_files)%>
-  <node name="Documentation files" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(documentation_files)%>
-      <file path="<%documentation_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-<%if(resource_files)%>
-  <node name="Resource files" type="Folder">
-    <property category="unique" name="id"/>
-<%foreach(resource_files)%>
-      <file path="<%resource_file%>">
-        <property category="unique" name="id"/>
-      </file>
-<%endfor%>
-  </node>
-<%endif%>
-</project>
diff --git a/templates/cbxdll.mpt b/templates/cbxdll.mpt
deleted file mode 100644
index b624d80b..00000000
--- a/templates/cbxdll.mpt
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "common"
-conditional_include "windowscommon"
-
-common_defines  = WIN32
-
-conditional_include "user_cbxdll"
diff --git a/templates/cbxexe.mpt b/templates/cbxexe.mpt
deleted file mode 100644
index bf30c44a..00000000
--- a/templates/cbxexe.mpt
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-conditional_include "common"
-conditional_include "windowscommon"
-
-common_defines  = WIN32
-
-conditional_include "user_cbxexe"
diff --git a/templates/html.mpd b/templates/html.mpd
index 7e8aa512..cc48e519 100644
--- a/templates/html.mpd
+++ b/templates/html.mpd
@@ -81,6 +81,7 @@
 <tr><td>macros</td><td><%macros%></td></tr>
 <tr><td>pch_header</td><td><%pch_header%></td></tr>
 <tr><td>pch_source</td><td><%pch_source%></td></tr>
+<tr><td>prebuild</td><td><%prebuild%></td></tr>
 <tr><td>postbuild</td><td><%postbuild%></td></tr>
 <tr><td>pure_libs</td><td><%pure_libs%></td></tr>
 <tr><td>recurse</td><td><%recurse%></td></tr>
diff --git a/templates/make.mpd b/templates/make.mpd
index fe75e07c..86388bd8 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -104,7 +104,7 @@ EXPORTFLAGS   = <%if(exename)%><%if(need_staticflags)%>$(STATICFLAGS)<%endif%><%
 #----------------------------------------------------------------------------
 
 <%if(exename)%>
-all: $(BIN)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(BIN)<%if(postbuild)%> __postbuild__<%endif%>
 
 <%if(specialscript)%>
 specialscript:
@@ -130,7 +130,7 @@ $(BIN): $(BTARGETDIR)<%if(tempinc)%> $(TEMPINCDIR)<%endif%><%if(prelink)%> <%tar
 
 <%endif%>
 <%if(dll_ext && sharedname)%>
-all:<%if(version && versupport)%> $(SHLIB).<%version%><%endif%> $(SHLIB)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%><%if(version && versupport)%> $(SHLIB).<%version%><%endif%> $(SHLIB)<%if(postbuild)%> __postbuild__<%endif%>
 
 <%if(dllout)%>
 $(SHTARGETDIR):
@@ -151,7 +151,7 @@ $(SHLIB)<%if(version && versupport)%>.<%version%><%endif%>: $(SHTARGETDIR) <%if(
 
 <%else%>
 <%if(staticname)%>
-all: $(LIB)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(LIB)<%if(postbuild)%> __postbuild__<%endif%>
 
 <%endif%>
 <%endif%>
@@ -162,7 +162,7 @@ $(LTARGETDIR):
 <%endif%>
 <%if(staticname)%>
 $(LIB): $(LTARGETDIR) <%if(tempinc)%>$(TEMPINCDIR) <%endif%>$(OBJS)
-	$(AR) $(ARFLAGS) $(LIB) $(OBJS)<%if(tempinc)%> `find $(TEMPINCDIR) -name \*.o\*`<%endif%>
+	$(AR) $(ARFLAGS) <%libgenopt%>$(LIB) $(OBJS)<%if(tempinc)%> `find $(TEMPINCDIR) -name \*.o\*`<%endif%>
 <%if(ranlib)%>
 	ranlib $(LIB)
 <%endif%>
@@ -212,7 +212,7 @@ PATH              := $(PATH):<%custom_type->libpath%>
 <%if(source_files)%>
 $(OBJS): $(GENERATED_DIRTY)
 <%else%>
-all: $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
+all:<%if(prebuild)%> __prebuild__<%endif%> $(GENERATED_DIRTY)<%if(postbuild)%> __postbuild__<%endif%>
 <%endif%>
 
 <%endif%>
@@ -264,6 +264,11 @@ realclean: clean
 	-$(RM) $(GENERATED_DIRTY)
 <%endif%>
 
+<%if(prebuild)%>
+__prebuild__:
+	@<%eval(prebuild)%>
+
+<%endif%>
 <%if(postbuild)%>
 __postbuild__:
 	@<%eval(postbuild)%>
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index bf1bdd60..5f79da5b 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -66,7 +66,7 @@ OUTDIR=<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>
 <%endif%>
 INTDIR=<%intermediate_dir%>\<%project_name%>\<%machine%>
 
-ALL : DEPENDCHECK $(GENERATED_DIRTY)<%if(exename)%><%if(install)%> "$(INSTALLDIR)"<%endif%><%endif%><%if(type_is_dynamic)%><%if(sharedname || staticname)%> "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%libname_prefix%><%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%>"<%endif%><%endif%><%if(staticname && type_is_static)%> "$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"<%endif%><%if(exename)%> "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>"<%endif%><%if(postbuild)%> __postbuild__<%endif%>
+ALL :<%if(prebuild)%> __prebuild__<%endif%> DEPENDCHECK $(GENERATED_DIRTY)<%if(exename)%><%if(install)%> "$(INSTALLDIR)"<%endif%><%endif%><%if(type_is_dynamic)%><%if(sharedname || staticname)%> "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%libname_prefix%><%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%>"<%endif%><%endif%><%if(staticname && type_is_static)%> "$(OUTDIR)\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"<%endif%><%if(exename)%> "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>"<%endif%><%if(postbuild)%> __postbuild__<%endif%>
 
 DEPEND :
 !IF "$(DEPGEN)" == ""
@@ -164,6 +164,11 @@ LINK32_OBJS= \
     if exist "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%><%dll_ext%>.manifest<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%><%exe_ext%>.manifest<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%><%lib_ext%>.manifest<%endif%>" mt.exe -manifest "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%><%dll_ext%>.manifest<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%><%exe_ext%>.manifest<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%><%lib_ext%>.manifest<%endif%>" -outputresource:$@;<%if(type_is_dynamic)%>2<%endif%><%if(exename)%>1<%endif%><%if(type_is_static)%>2<%endif%>
 <%endif%>
 
+<%if(prebuild)%>
+__prebuild__:
+	@<%eval(prebuild)%>
+
+<%endif%>
 <%if(postbuild)%>
 __postbuild__:
 	@<%eval(postbuild)%>
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index fac10496..c1ae070d 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -166,7 +166,11 @@
 <%endif%>
 			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+<%if(prebuild)%>
+				CommandLine="<%eval(prebuild)%>"
+<%endif%>
+			/>
 <%if(!custom_only)%>
 			<Tool
 				Name="VCPreLinkEventTool"/>
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index fcb7e02a..441a5e0c 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -40,6 +40,9 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+<%if(prebuild)%>
+				CommandLine="<%eval(prebuild)%>"
+<%endif%>
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
author	elliott_c <ocielliottc@users.noreply.github.com>	2006-03-09 16:21:18 +0000
committer	elliott_c <ocielliottc@users.noreply.github.com>	2006-03-09 16:21:18 +0000
commit	3fec7bfedb10c9c99448ee03d4ea1f398ec165f6 (patch)
tree	7b2794f032385277de3c3018ed084d2115d6dc66
parent	a3717a1908096b14a4cacb951e92999aa4216216 (diff)
download	MPC-3fec7bfedb10c9c99448ee03d4ea1f398ec165f6.tar.gz