ChangeLogTag: Wed Apr 23 12:32:29 2003 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 52 insertions, 4 deletions

diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 219b65c13ec..87a95cf4183 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -2,7 +2,10 @@
 #       Macros
 #----------------------------------------------------------------------------
 <%marker(top)%>
-SOEXT         = so
+<%foreach(configurations)%>
+CXX           = <%cxx%>
+<%endfor%>
+CCC           = $(CXX)
 MAKEFILE      = <%project_file%>
 <%if(exename)%>
 BIN           = <%exename%>
@@ -12,7 +15,13 @@ LIB           = lib<%staticname%>.a
 <%endif%>
 <%if(sharedname)%>
 SHLIB         = lib<%sharedname%>.$(SOEXT)
-CPPFLAGS     += -KPIC
+<%foreach(platforms)%>
+SOEXT         = <%soext%>
+<%endfor%>
+<%foreach(configurations)%>
+CPPFLAGS     += <%pic%>
+SHFLAGS       = <%shflags%>
+<%endfor%>
 <%endif%>
 <%if(idl_files)%>
 IDL_FILES     =<%foreach(idl_files)%> <%noextension(idl_file)%><%endfor%>
@@ -26,6 +35,9 @@ CPPFLAGS     +=<%foreach(includes)%> -I<%include%><%endfor%>
 <%if(libpaths)%>
 LDFLAGS      +=<%foreach(libpaths)%> -L<%libpath%><%endfor%>
 <%endif%>
+<%foreach(platforms)%>
+LDLIBS       += <%ldlibs%>
+<%endfor%>
 <%if(libs)%>
 LDLIBS       +=<%foreach(libs)%> -l<%lib%><%endfor%>
 <%endif%>
@@ -38,7 +50,6 @@ LDLIBS       +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%>
 <%if(ssl)%>
 LDLIBS       +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
 <%endif%>
-SHFLAGS       = -G
 OUTPUT_OPTION = -o $@
 <%marker(macros)%>
 
@@ -92,7 +103,7 @@ clean:
 	-$(RM) $(OBJS)
 
 realclean: clean
-	-$(RM) <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%>
+	-$(RM) <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%><%if(install)%> <%install%>/$(INSTARGET)<%endif%>
 
 #----------------------------------------------------------------------------
 #       Dependencies
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
new file mode 100644
index 00000000000..27d74b58fc0
--- /dev/null
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -0,0 +1,36 @@
+configurations = gcc
+soext          = so
+
+gcc {
+  cxx       = g++
+  pic       = -fPIC
+  shflags   = -shared
+  platforms = linux
+}
+
+CC {
+  cxx       = CC
+  pic       = -KPIC
+  shflags   = -G
+  platforms = solaris
+}
+
+aCC {
+  cxx       = aCC
+  pic       = +Z
+  shflags   = -b
+  platforms = hpux
+}
+
+linux {
+  ldlibs = -ldl -lpthread
+}
+
+solaris {
+  ldlibs = -lsocket -ldl -lnsl -lgen -lposix4
+}
+
+hpux {
+  soext  = sl
+  ldlibs = -lxti -lpthread -lrt -ldld
+}
diff --git a/bin/MakeProjectCreator/templates/makeexe.mpt b/bin/MakeProjectCreator/templates/makeexe.mpt
new file mode 100644
index 00000000000..e3504056f1b
--- /dev/null
+++ b/bin/MakeProjectCreator/templates/makeexe.mpt
@@ -0,0 +1 @@
+conditional_include "makedll"