1 files changed, 29 insertions, 11 deletions
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 8e4194761fb..4da186b39a6 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -12,45 +12,64 @@ OBJFILES = \
 	$(OBJDIR)\<%noextension(source_file)%>.obj<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
+<%if(ssl)%>
 
-<%if(libs)%>
-LIBFILES = \
-<%foreach(libs)%>
-	$(CORE_BINDIR)\<%lib%>.lib<%fornotlast(" \\")%>
-<%endfor%>
+SSL_LIBS =<%foreach(ssl_libs)%> <%ssl_lib%>.lib<%endfor%>
+<%else%>
+SSL_LIBS =
 <%endif%>
 
+LIBFILES = $(SSL_LIBS) \
+<%foreach(libs defaultlibs)%>
+           $(CORE_BINDIR)\<%lib%>.lib<%fornotlast(" \\")%>
+<%endfor%>
 <%if(idl_files)%>
+
 IDLFILES = \
 <%foreach(idl_files)%>
 	$(IDLDIR)\<%noextension(idl_file)%>.idl<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
-
 <%if(resource_files)%>
+
 RESOURCE =<%foreach(resource_files)%> $(OBJDIR)\<%noextension(resource_file)%>.res<%endfor%>
 <%endif%>
 
-CFLAGS =<%foreach(includes)%> -I<%include%><%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%>=1<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%>=1<%endfor%><%endif%>
+!ifdef STATIC
+LIB_FLAGS =<%foreach(libflags)%> -D<%libflag%>=1<%endfor%>
+DLL_FLAGS =
+!else
+LIB_FLAGS =
+DLL_FLAGS =<%foreach(dllflags)%> -D<%dllflag%>=1<%endfor%>
+!endif
+
+CFLAGS =<%foreach(includes)%> -I<%include%><%endfor%> $(DLL_FLAGS) $(LIB_FLAGS)
 CPPDIR = .
 INCDIR_NAME = .
+<%if(idl_files)%>
 IDLDIR = .
-
+<%endif%>
 <%if(header_files)%>
+
 INCLUDES = \
 <%foreach(header_files template_files)%>
         <%header_file%><%fornotlast(" \\")%>
 <%endfor%>
-
 <%endif%>
 <%if(exename)%>
+<%if(install)%>
+
+INSTALL_THIS_TARGET = 1
+<%endif%>
+
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 <%endif%>
 <%if(sharedname)%>
+
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
 <%endif%>
+<%if(idl_files)%>
 
-<%if(libs)%>
 #
 # IDL Build rules
 #
@@ -58,6 +77,5 @@ INCLUDES = \
 <%foreach(idl_files)%>
 $(IDLDIR)\<%noextension(idl_file)%>S.cpp $(IDLDIR)\<%noextension(idl_file)%>C.cpp: $(IDLDIR)\<%noextension(idl_file)%>.idl
 	$(TAO_IDL) $**
-
 <%endfor%>
 <%endif%>