Wed Jun 25 11:00:00 2003 Justin Michel <michel_j@ociweb.com>

30 files changed, 125 insertions, 75 deletions

diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index d2b5dbab..0e38bd05 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -43,7 +43,7 @@ my(%validNames) = ('exename'         => 1,
                    'idlflags'        => 1,
                    'idlpreprocessor' => 1,
                    'defaultlibs'     => 1,
-                   'depends'         => 1,
+                   'after'           => 1,
                    'libs'            => 1,
                    'lit_libs'        => 1,
                    'pch_header'      => 1,
@@ -51,8 +51,8 @@ my(%validNames) = ('exename'         => 1,
                    'ssl'             => 1,
                    'dllout'          => 1,
                    'libout'          => 1,
-                   'dllflags'        => 1,
-                   'libflags'        => 1,
+                   'dynamicflags'    => 1,
+                   'staticflags'     => 1,
                    'version'         => 1,
                    'requires'        => 1,
                    'avoids'          => 1,
@@ -2306,7 +2306,7 @@ sub translate_value {
   my($key)  = shift;
   my($val)  = shift;
 
-  if ($key eq 'depends' && $val ne '') {
+  if ($key eq 'after' && $val ne '') {
     my($arr) = $self->create_array($val);
     $val = '';
     foreach my $entry (@$arr) {
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index b082b31b..118db647 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -834,7 +834,7 @@ sub collect_data {
   $prjc->update_project_info($self, 0, ['project_name']);
 
   ## This is for all projects
-  $prjc->update_project_info($self, 1, ['depends']);
+  $prjc->update_project_info($self, 1, ['after']);
 
   ## VC7 Projects need to know the GUID.
   ## We need to save this value in our known values
diff --git a/modules/VA4ProjectCreator.pm b/modules/VA4ProjectCreator.pm
index 942be40a..17b893f6 100644
--- a/modules/VA4ProjectCreator.pm
+++ b/modules/VA4ProjectCreator.pm
@@ -32,7 +32,7 @@ sub translate_value {
   my($key)  = shift;
   my($val)  = shift;
 
-  if ($key eq 'depends' && $val ne '') {
+  if ($key eq 'after' && $val ne '') {
     my($wt)  = $self->get_writing_type();
     my($arr) = $self->create_array($val);
     $val = '';
diff --git a/modules/VC6ProjectCreator.pm b/modules/VC6ProjectCreator.pm
index a02931a0..fa0edd31 100644
--- a/modules/VC6ProjectCreator.pm
+++ b/modules/VC6ProjectCreator.pm
@@ -46,7 +46,7 @@ sub translate_value {
   my($key)  = shift;
   my($val)  = shift;
 
-  if ($key eq 'depends' && $val ne '') {
+  if ($key eq 'after' && $val ne '') {
     my($arr) = $self->create_array($val);
     $val = '';
 
diff --git a/templates/em3.mpd b/templates/em3.mpd
index 1b698ad5..819d950d 100644
--- a/templates/em3.mpd
+++ b/templates/em3.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -197,7 +197,8 @@ InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
 
 BuildCmds= \
-	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+    PATH=%PATH%;<%idl_compiler_libs%> \
+	<%idl_compiler%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd
index 1b698ad5..819d950d 100644
--- a/templates/em3vcp.mpd
+++ b/templates/em3vcp.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
@@ -197,7 +197,8 @@ InputName=<%basenoextension(idl_file)%>
 InputDir=<%dirname(idl_file)%>
 
 BuildCmds= \
-	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
+    PATH=%PATH%;<%idl_compiler_libs%> \
+	<%idl_compiler%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath)
 
 "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
diff --git a/templates/em3vcpdll.mpt b/templates/em3vcpdll.mpt
index 3fa0d33f..de5e2768 100644
--- a/templates/em3vcpdll.mpt
+++ b/templates/em3vcpdll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 configurations        = Release Debug
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = Debug
diff --git a/templates/em3vcpdllexe.mpt b/templates/em3vcpdllexe.mpt
index e9f51c2e..307953ee 100644
--- a/templates/em3vcpdllexe.mpt
+++ b/templates/em3vcpdllexe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Application"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = Debug
diff --git a/templates/em3vcplib.mpt b/templates/em3vcplib.mpt
index 72360c63..fb647367 100644
--- a/templates/em3vcplib.mpt
+++ b/templates/em3vcplib.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Static Library"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = "Static Debug"
@@ -5,7 +7,7 @@ default_platform_long = "WCE ARM"
 configurations        = "Static Release" "Static Debug"
 common_defines        = UNICODE _UNICODE
 type_is_static        = 1
-need_libflags         = 1
+need_staticflags      = 1
 stack                 =
 
 WCE x86 {
diff --git a/templates/em3vcplibexe.mpt b/templates/em3vcplibexe.mpt
index a8724c29..8ef62af7 100644
--- a/templates/em3vcplibexe.mpt
+++ b/templates/em3vcplibexe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Application"
 platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = "Static Debug"
@@ -6,8 +8,7 @@ configurations        = "Static Release" "Static Debug"
 type_is_binary        = 1
 common_defines        = UNICODE _UNICODE
 ssl_libs              = libeay32 ssleay32
-zzip_libs             = z zzip
-need_libflags         = 1
+need_staticflags      = 1
 pdb                   = 1
 stack                 =
 
diff --git a/templates/make.mpd b/templates/make.mpd
index 2ca6a275..c13dc330 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -106,7 +106,7 @@ $(BIN): $(OBJS)
 
 <%endif%>
 <%if(sharedname)%>
-all: $(SHLIB) <%if(install)%>install<%endif%>
+all: $(SHLIB) <%if(install)%>install<%else%><%if(!exename)%>install<%endif%><%endif%>
 
 $(SHLIB): $(OBJS)
 	$(LINK.cc) $(SHFLAGS) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
@@ -123,7 +123,15 @@ $(LIB): $(OBJS)
 <%if(install)%>
 <%if(exename)%>
 INSTARGET = $(BIN)
+install:
+	@echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"
+	@mkdir -p "<%install%>"
+	@$(RM) "<%install%>/$(INSTARGET)"
+	@ln -s "$(PWD)/$(INSTARGET)" "<%install%>"
+
+<%endif%>
 <%else%>
+<%if(!exename)%>
 <%if(sharedname)%>
 INSTARGET = $(SHLIB)
 <%else%>
@@ -131,13 +139,11 @@ INSTARGET = $(SHLIB)
 INSTARGET = $(LIB)
 <%endif%>
 <%endif%>
-<%endif%>
 install:
-	@echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"
-	@mkdir -p "<%install%>"
-	@$(RM) "<%install%>/$(INSTARGET)"
-	@ln -s "$(PWD)/$(INSTARGET)" "<%install%>"
-
+	@mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"
+	@$(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)"
+	@ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"
+<%endif%>
 <%endif%>
 clean:
 	-$(RM) $(OBJS)
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index 15e8c50f..0ae2c4a9 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler"
+
 configurations = gcc
 soext          = so
 ssl_libs       = ssl crypto
diff --git a/templates/makeexe.mpt b/templates/makeexe.mpt
index e3504056..ca465a3e 100644
--- a/templates/makeexe.mpt
+++ b/templates/makeexe.mpt
@@ -1 +1,2 @@
 conditional_include "makedll"
+
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index acf4a359..5bdec1d8 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -48,10 +48,10 @@ OUTDIR=<%libout%>
 <%endif%>
 INTDIR=<%intermediate_dir%>\<%noextension(project_file)%>
 
-ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%>
+ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%>
 
 DEPEND :
-	perl <%depgen("$(ACE_ROOT)\\bin\\depgen.pl")%><%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines macros)%> -D<%define%><%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%><%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%> -D<%zzip_define%><%endfor%> -I"$(ZZIP_ROOT)\include" <%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%>
+	perl <%depgen("$(ACE_ROOT)\\bin\\depgen.pl")%><%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines macros)%> -D<%define%><%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%> -D<%staticflag%><%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%>
 
 <%if(idl_files)%>
 IDL_STUBS :<%foreach(idl_files)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>C.cpp"<%endfor%>
@@ -76,7 +76,7 @@ REALCLEAN : CLEAN
 <%endif%>
 <%endif%>
 <%if(type_is_dynamic)%>
-        -@erase "<%dllout%>\<%sharedname%><%lib_modifier%>.dll"
+        -@erase "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll"
 <%endif%>
 <%if(exename)%>
         -@erase "$(INSTALLDIR)\<%exename%>.exe"
@@ -110,7 +110,7 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%><%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%><%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -199,7 +199,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
+CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
 
 "$(INTDIR)\<%basenoextension(pch_source)%>.obj"	"$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -238,7 +238,7 @@ InputDir=<%dirname(idl_file)%>
 "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.h"	"<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.i"	"<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)C.cpp"	"<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.h"	"<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.i"	"<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%>\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat
 	@echo off
-	<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>
+	<%idl_compiler%> -o <%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%if(dirname_found)%>$(InputDir)<%else%>.<%endif%><%endif%><%endif%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>
 <<
 
 <%endfor%>
@@ -288,3 +288,4 @@ SOURCE=.\<%resource_file%>
 <%endfor%>
 
 !ENDIF
+
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 1e45e05b..3c514b15 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 configurations        = Release Debug "Static Release" "Static Debug"
 platforms             = Win32
 default_configuration = Debug
@@ -59,7 +61,7 @@ Static Release {
   lib_modifier          = s
   debug_switch          =
   type_is_static        = 1
-  need_libflags         = 1
+  need_staticflags      = 1
 }
 
 Static Debug {
@@ -73,7 +75,7 @@ Static Debug {
   intermediate_dir      = Static_Debug
   lib_modifier          = sd
   type_is_static        = 1
-  need_libflags         = 1
+  need_staticflags      = 1
 }
 
 MFC Release {
@@ -121,7 +123,7 @@ Static MFC Release {
   lib_modifier          = mfcs
   debug_switch          =
   type_is_static        = 1
-  need_libflags         = 1
+  need_staticflags      = 1
 }
 
 Static MFC Debug {
@@ -135,7 +137,7 @@ Static MFC Debug {
   intermediate_dir      = Static_MFC_Debug
   lib_modifier          = mfcsd
   type_is_static        = 1
-  need_libflags         = 1
+  need_staticflags      = 1
 }
 
 conditional_include "vcfullmacros"
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 8db3cd2d..eca1cc70 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Console Application"
 type_code             = 0x0103
 configurations        = Release Debug "Static Release" "Static Debug"
@@ -50,7 +52,7 @@ Static Release {
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
-  need_libflags         = 1
+  need_staticflags      = 1
   output_dir            = Static_Release
   intermediate_dir      = Static_Release
   debug_switch          =
@@ -62,7 +64,7 @@ Static Debug {
   defines               = _DEBUG
   compile_flags_removed = /YX
   lib_modifier          = sd
-  need_libflags         = 1
+  need_staticflags      = 1
   output_dir            = Static_Debug
   intermediate_dir      = Static_Debug
 }
@@ -101,7 +103,7 @@ Static MFC Release {
   defines               = NDEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcs
-  need_libflags         = 1
+  need_staticflags      = 1
   output_dir            = Static_MFC_Release
   intermediate_dir      = Static_MFC_Release
   debug_switch          =
@@ -114,7 +116,7 @@ Static MFC Debug {
   defines               = _DEBUG _AFXDLL
   compile_flags_removed = /YX
   lib_modifier          = mfcsd
-  need_libflags         = 1
+  need_staticflags      = 1
   output_dir            = Static_MFC_Debug
   intermediate_dir      = Static_MFC_Debug
 }
diff --git a/templates/va4icc.mpd b/templates/va4icc.mpd
index 086effa1..51107033 100644
--- a/templates/va4icc.mpd
+++ b/templates/va4icc.mpd
@@ -12,13 +12,13 @@ if $__TOS_WIN__ {
 <%endfor%>
 <%endif%>
 <%if(type_is_dynamic)%>
-<%foreach(dllflags)%>
-                define ("<%dllflag%>", "1"),
+<%foreach(dynamicflags)%>
+                define ("<%dynamicflag%>", "1"),
 <%endfor%>
 <%endif%>
-<%if(need_libflags)%>
-<%foreach(libflags)%>
-                define ("<%libflag%>", "1"),
+<%if(need_staticflags)%>
+<%foreach(staticflags)%>
+                define ("<%staticflag%>", "1"),
 <%endfor%>
 <%endif%>
                 define ("_stricmp", "stricmp"),
diff --git a/templates/va4iccdll.mpt b/templates/va4iccdll.mpt
index 4be92945..bc49da13 100644
--- a/templates/va4iccdll.mpt
+++ b/templates/va4iccdll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 common_defines  = _WINDOWS WIN32
 type_is_dynamic = 1
 lib_modifier    = d
diff --git a/templates/va4iccdllexe.mpt b/templates/va4iccdllexe.mpt
index d72d9958..893387a1 100644
--- a/templates/va4iccdllexe.mpt
+++ b/templates/va4iccdllexe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 common_defines  = _WINDOWS _CONSOLE
 type_is_binary  = 1
 lib_modifier    = d
diff --git a/templates/va4icclib.mpt b/templates/va4icclib.mpt
index e7a0d874..95237c4a 100644
--- a/templates/va4icclib.mpt
+++ b/templates/va4icclib.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 common_defines  = _WINDOWS WIN32
 type_is_static  = 1
 lib_modifier    = d
diff --git a/templates/va4icclibexe.mpt b/templates/va4icclibexe.mpt
index d21d7e76..01da5ffb 100644
--- a/templates/va4icclibexe.mpt
+++ b/templates/va4icclibexe.mpt
@@ -1,6 +1,9 @@
+conditional_include "idl_compiler_win32"
+
 common_defines  = _WINDOWS _CONSOLE
 type_is_binary  = 1
 lib_modifier    = d
 defines         = _DEBUG
-need_libflags   = 1
+need_staticflags   = 1
 conditional_include "zziplib"
+
diff --git a/templates/vc6.mpd b/templates/vc6.mpd
index f4aceaf1..8b45ae86 100644
--- a/templates/vc6.mpd
+++ b/templates/vc6.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd
index f4aceaf1..8b45ae86 100644
--- a/templates/vc6dsp.mpd
+++ b/templates/vc6dsp.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(zzip)%><%foreach(zzip_defines)%> /D <%zzip_define%> <%endfor%> /I "$(ZZIP_ROOT)\include" <%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dllflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/templates/vc6dspdll.mpt b/templates/vc6dspdll.mpt
index a82981f9..478e8c60 100644
--- a/templates/vc6dspdll.mpt
+++ b/templates/vc6dspdll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 configurations  = Release Debug
 type_is_binary  = 1
 type_is_dynamic = 1
diff --git a/templates/vc6dspdllexe.mpt b/templates/vc6dspdllexe.mpt
index aba7ee76..6ddbfe38 100644
--- a/templates/vc6dspdllexe.mpt
+++ b/templates/vc6dspdllexe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 type_description = "Console Application"
 type_code        = 0x0103
 configurations   = Release Debug
diff --git a/templates/vc6dsplib.mpt b/templates/vc6dsplib.mpt
index e1e9b9b7..4a75f918 100644
--- a/templates/vc6dsplib.mpt
+++ b/templates/vc6dsplib.mpt
@@ -1,29 +1,32 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Static Library"
 type_code             = 0x0104
-configurations        = "Static Release" "Static Debug"
-default_configuration = "Static Debug"
+configurations        = Release Debug
+default_configuration = Debug
 common_defines        = WIN32 _WINDOWS
 type_is_static        = 1
-need_libflags         = 1
+need_staticflags         = 1
+
 
-Static Release {
+Release {
   use_debug_libraries   = 0
   compile_flags         = /G5 /W3 /GX /O2 /MD /Zi /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
-  output_dir            = Static_Release
-  intermediate_dir      = Static_Release
+  output_dir            = Release
+  intermediate_dir      = Release
   lib_modifier          = s
   debug_switch          =
 }
 
-Static Debug {
+Debug {
   use_debug_libraries   = 1
   compile_flags         = /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd
   defines               = _DEBUG
   compile_flags_removed = /Fr /YX
-  output_dir            = Static_Debug
-  intermediate_dir      = Static_Debug
+  output_dir            = Debug
+  intermediate_dir      = Debug
   lib_modifier          = sd
   pdb                   = 1
 }
diff --git a/templates/vc6dsplibexe.mpt b/templates/vc6dsplibexe.mpt
index a618518a..2fd53c5e 100644
--- a/templates/vc6dsplibexe.mpt
+++ b/templates/vc6dsplibexe.mpt
@@ -1,34 +1,37 @@
+conditional_include "idl_compiler_win32"
+
 type_description      = "Console Application"
 type_code             = 0x0103
-configurations        = "Static Release" "Static Debug"
-default_configuration = "Static Debug"
+configurations        = Release Debug
+default_configuration = Debug
 type_is_binary        = 1
 common_defines        = WIN32 _CONSOLE
 subsystem             = console
 ssl_libs              = libeay32 ssleay32
 zzip_libs             = z zzip
-need_libflags         = 1
+need_staticflags         = 1
 pdb                   = 1
 
-Static Release {
+
+Release {
   use_debug_libraries   = 0
   compile_flags         = /W3 /GX /O2 /MD /GR
   defines               = NDEBUG
   compile_flags_removed = /YX
   lib_modifier          = s
-  output_dir            = Static_Release
-  intermediate_dir      = Static_Release
+  output_dir            = Release
+  intermediate_dir      = Release
   debug_switch          =
 }
 
-Static Debug {
+Debug {
   use_debug_libraries   = 1
   compile_flags         = /W3 /Gm /GX /Zi /Od /MDd /GR /Gy
   defines               = _DEBUG
   compile_flags_removed = /YX
   lib_modifier          = sd
-  output_dir            = Static_Debug
-  intermediate_dir      = Static_Debug
+  output_dir            = Debug
+  intermediate_dir      = Debug
 }
 
 MFC Release {
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index 7cff53ca..e98557ba 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -28,7 +28,7 @@
 				InlineFunctionExpansion="<%inline("2")%>"
 <%endif%>
 				AdditionalIncludeDirectories="<%foreach(includes)%><%include%><%fornotlast(",")%><%endfor%><%if(zzip)%>,$(ZZIP_ROOT)\include<%endif%>"
-				PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dllflags)%><%dllflag%>;<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%><%zzip_define%>;<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
+				PreprocessorDefinitions="<%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dllflag%>;<%endfor%><%endif%><%if(zzip)%><%foreach(zzip_defines)%><%zzip_define%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%libflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
 <%if(!debug)%>
 				StringPooling="<%string_pooling("TRUE")%>"
 <%endif%>
@@ -66,7 +66,7 @@
 <%endif%>
 <%if(pdb)%>
 <%if(sharedname)%>
-				ProgramDatabaseFile="<%dllout%>\<%sharedname%><%lib_modifier%>.pdb"
+				ProgramDatabaseFile="<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"
 <%else%>
 <%if(exename)%>
 				ProgramDatabaseFile="<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"
@@ -154,18 +154,22 @@
 						Name="VCCustomBuildTool"
 						Description="Invoking IDL Compiler on <%basename(idl_file)%> located in <%dirname(idl_file)%>"
 <%if(flag_overrides(idl_file, idlgendir))%>
-						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="PATH=%PATH%;<%idl_compiler_libs%>
+<%idl_compiler%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.cpp;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
 <%if(idlgendir)%>
-						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="PATH=%PATH%;<%idl_compiler_libs%>
+<%idl_compiler%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%idlgendir%>\<%basenoextension(idl_file)%>C.h;<%idlgendir%>\<%basenoextension(idl_file)%>C.i;<%idlgendir%>\<%basenoextension(idl_file)%>C.cpp;<%idlgendir%>\<%basenoextension(idl_file)%>S.h;<%idlgendir%>\<%basenoextension(idl_file)%>S.i;<%idlgendir%>\<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
 <%if(dirname_found)%>
-						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="PATH=%PATH%;<%idl_compiler_libs%>
+<%idl_compiler%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%basenoextension(idl_file)%>C.h;<%basenoextension(idl_file)%>C.i;<%basenoextension(idl_file)%>C.cpp;<%basenoextension(idl_file)%>S.h;<%basenoextension(idl_file)%>S.i;<%basenoextension(idl_file)%>S.cpp"/>
 <%else%>
-						CommandLine="<%idl_compiler("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
+						CommandLine="PATH=%PATH%;<%idl_compiler_libs%>
+<%idl_compiler%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>"
 						Outputs="<%noextension(idl_file)%>C.h;<%noextension(idl_file)%>C.i;<%noextension(idl_file)%>C.cpp;<%noextension(idl_file)%>S.h;<%noextension(idl_file)%>S.i;<%noextension(idl_file)%>S.cpp"/>
 <%endif%>
 <%endif%>
diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt
index 96b65d1c..8e00dfa0 100644
--- a/templates/vc7dll.mpt
+++ b/templates/vc7dll.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 configurations     = Release Debug "Static Release" "Static Debug"
 common_defines     = WIN32 _WINDOWS
 ssl_libs           = libeay32 ssleay32
@@ -32,7 +34,7 @@ Static Release {
   output_dir       = Static_Release
   intermediate_dir = Static_Release
   lib_modifier     = s
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 2
 }
 
@@ -44,7 +46,7 @@ Static Debug {
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
   lib_modifier     = sd
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 3
 }
 
@@ -80,7 +82,7 @@ Static MFC Release {
   output_dir       = Static_MFC_Release
   intermediate_dir = Static_MFC_Release
   lib_modifier     = mfcs
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 2
   use_mfc          = 2
 }
@@ -93,7 +95,7 @@ Static MFC Debug {
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
   lib_modifier     = mfcsd
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 3
   use_mfc          = 2
 }
diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt
index e39356dc..a2eaebe1 100644
--- a/templates/vc7exe.mpt
+++ b/templates/vc7exe.mpt
@@ -1,3 +1,5 @@
+conditional_include "idl_compiler_win32"
+
 configurations     = Release Debug "Static Release" "Static Debug"
 type_is_binary     = 1
 common_defines     = WIN32 _CONSOLE
@@ -29,7 +31,7 @@ Static Release {
   output_dir       = Static_Release
   intermediate_dir = Static_Release
   lib_modifier     = s
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 2
 }
 
@@ -40,7 +42,7 @@ Static Debug {
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
   lib_modifier     = sd
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 3
 }
 
@@ -71,7 +73,7 @@ Static MFC Release {
   output_dir       = Static_MFC_Release
   intermediate_dir = Static_MFC_Release
   lib_modifier     = mfcs
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 2
   use_mfc          = 2
 }
@@ -83,7 +85,7 @@ Static MFC Debug {
   output_dir       = Static_MFC_Debug
   intermediate_dir = Static_MFC_Debug
   lib_modifier     = mfcsd
-  need_libflags    = 1
+  need_staticflags    = 1
   runtime_library  = 3
   use_mfc          = 2
 }