ChangeLogTag: Fri Aug 12 11:44:23 2005 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 68 insertions, 90 deletions

diff --git a/ChangeLog b/ChangeLog
index 46bdd81c..fd1a0805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 12 11:44:23 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * templates/make.mpd:
+        * templates/makedll.mpt:
+
+          Reworked the way that 64 and 32 bit builds are specified.  64 bit
+          is still the default, however to build 32 bit requires that the
+          user set the template variable build64bit to empty.
+
 Thu Aug 11 13:30:07 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/ProjectCreator.pm:
diff --git a/templates/make.mpd b/templates/make.mpd
index ee88d208..14b12d22 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -22,17 +22,21 @@ CPU           = <%cpu%>
 <%if(pic)%>
 PICFLAGS      = <%pic%>
 <%endif%>
-CPPFLAGS      = $(PICFLAGS) $(GENFLAGS)<%if(compile_flags)%> <%compile_flags%><%endif%><%if(compileflags)%> <%compileflags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%if(compilerflags)%> <%compilerflags%><%endif%><%if(pch_source && pchsupport)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%foreach(platforms)%><%if(extracppflags)%> <%extracppflags%><%endif%><%endfor%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
+CPPFLAGS      = $(PICFLAGS) $(GENFLAGS)<%if(compile_flags)%> <%compile_flags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%if(compilerflags)%> <%compilerflags%><%endif%><%if(build64bit && compilerflags64)%> <%compilerflags64%><%endif%><%if(pch_source && pchsupport)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%foreach(platforms)%><%if(extracppflags)%> <%extracppflags%><%endif%><%endfor%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
 OBJEXT        = <%obj_ext%>
 OUTPUT_OPTION = <%output_option(-o \"$@\")%>
 COMPILE.cc    = $(CXX) $(CCFLAGS) $(CPPFLAGS) <%compile_option("-c")%>
+<%if(build64bit && arflags64)%>
+ARFLAGS       = <%arflags64%>
+<%else%>
 <%if(arflags)%>
 ARFLAGS       = <%arflags%>
 <%endif%>
+<%endif%>
 <%if(tempinc)%>
 TEMPINCDIR    = <%tempinc%><%slash%><%project_name%>
 <%endif%>
-LDFLAGS       =<%if(libpaths)%><%foreach(libpaths)%> -L<%libpath%><%endfor%><%endif%><%if(linkflags)%> <%linkflags%><%endif%>
+LDFLAGS       =<%if(libpaths)%><%foreach(libpaths)%> -L<%libpath%><%endfor%><%endif%><%if(linkflags)%> <%linkflags%><%endif%><%if(build64bit && linkflags64)%> <%linkflags64%><%endif%>
 <%endfor%>
 CCC           = $(CXX)
 MAKEFILE      = <%project_file%>
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index 4cd3394c..d93a85ce 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -28,6 +28,7 @@ pchsupport       = 1
 targetoutdir     =
 slash            = /
 libopt           = -l
+build64bit       = 1
 
 // ***********************************************************************
 // Configuration Section
@@ -64,107 +65,71 @@ gcc {
 }
 
 SunCC {
-  cxx          = CC
-  pic          = -KPIC
-  shflags      = -G
-  compileflags = -xarch=v9
-  linkflags    = -library=Cstd -library=Crun
-  clean        = SunWS_cache ir.out
-  platforms    = solaris
-}
-
-SunCC32 {
-  cxx       = CC
-  pic       = -KPIC
-  shflags      = -G
-  linkflags = -library=Cstd -library=Crun
-  clean     = SunWS_cache ir.out
-  platforms = solaris
+  cxx             = CC
+  pic             = -KPIC
+  shflags         = -G
+  compilerflags64 = -xarch=v9
+  linkflags       = -library=Cstd -library=Crun
+  clean           = SunWS_cache ir.out
+  platforms       = solaris
 }
 
 aCC {
-  cxx           = aCC
-  pic           = +Z
-  shflags       = -b
-  platforms     = hpux
-  compilerflags = -AA -D_RWSTD_MULTI_THREAD +W336 +DA2.0W +DS2.0W
-  linkflags     = -Wl,+s -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 -ldl
-  pchcreate     = "+hdr_create "
-  pchuse        = "+hdr_use "
-}
-
-aCC32 {
-  cxx           = aCC
-  pic           = +Z
-  shflags       = -b
-  platforms     = hpux
-  compilerflags = -AA -D_RWSTD_MULTI_THREAD +W336
-  linkflags     = -Wl,+s
-  pchcreate     = "+hdr_create "
-  pchuse        = "+hdr_use "
+  cxx             = aCC
+  pic             = +Z
+  shflags         = -b
+  platforms       = hpux
+  compilerflags   = -AA -D_RWSTD_MULTI_THREAD +W336
+  compilerflags64 = +DA2.0W +DS2.0W
+  linkflags       = -Wl,+s
+  linkflags64     = -Wl,-x -Wl,+h$(@F) -ldl
+  pchcreate       = "+hdr_create "
+  pchuse          = "+hdr_use "
 }
 
 xlC_r {
-  cxx           = xlC_r
-  arflags      += -X64 -rv
-  compilerflags = -q64
-  platforms     = aix
-  pchcreate     = -qgenpcomp=
-  pchuse        = -qusepcomp=
-}
-
-xlC_r32 {
-  cxx       = xlC_r
-  platforms = aix
-  pchcreate = -qgenpcomp=
-  pchuse    = -qusepcomp=
+  cxx             = xlC_r
+  arflags64      += -X64 -rv
+  compilerflags64 = -q64
+  platforms       = aix
+  pchcreate       = -qgenpcomp=
+  pchuse          = -qusepcomp=
 }
 
 SGICC {
-  cxx          = CC
-  pic          = -KPIC
-  shflags      = -shared
-  compileflags = -64
-  linkflags    = -Wl,-woff,84
-  clean        = ii_files
-  platforms    = irix
-  pchcreate    = -LANG:create_pch=
-  pchuse       = -diag_suppress 3056 -LANG:use_pch=
-}
-
-SGICC32 {
-  cxx       = CC
-  pic       = -KPIC
-  shflags   = -shared
-  linkflags = -Wl,-woff,84 -ldl
-  clean     = ii_files
-  platforms = irix
-  pchcreate = -LANG:create_pch=
-  pchuse    = -diag_suppress 3056 -LANG:use_pch=
+  cxx             = CC
+  pic             = -KPIC
+  shflags         = -shared
+  compilerflags64 = -64
+  linkflags       = -Wl,-woff,84
+  clean           = ii_files
+  platforms       = irix
+  pchcreate       = -LANG:create_pch=
+  pchuse          = -diag_suppress 3056 -LANG:use_pch=
 }
 
 wrsppc {
-  cxx          = g++ppc
-  ld           = ldppc
-  cputype      = ppc
-  cpu          = PPC604
-  ar           = arppc
-  nm           = nmppc
-  compileflags = -mlongcall -nostdlib
-  linkflags    = -X -r
-  platforms    = vxworks
+  cxx           = g++ppc
+  ld            = ldppc
+  cputype       = ppc
+  cpu           = PPC604
+  ar            = arppc
+  nm            = nmppc
+  compilerflags = -mlongcall -nostdlib
+  linkflags     = -X -r
+  platforms     = vxworks
 }
 
 wrspentium {
-  cxx          = g++pentium
-  ld           = ldpentium
-  cputype      = pentium
-  cpu          = PENTIUM
-  ar           = arpentium
-  nm           = nmpentium
-  compileflags = -nostdlib
-  linkflags    = -X -r
-  platforms    = vxworks
+  cxx           = g++pentium
+  ld            = ldpentium
+  cputype       = pentium
+  cpu           = PENTIUM
+  ar            = arpentium
+  nm            = nmpentium
+  compilerflags = -nostdlib
+  linkflags     = -X -r
+  platforms     = vxworks
 }
 
 NCC {
@@ -247,13 +212,13 @@ vxworks {
   extracppflags = -I$(WIND_BASE)/target/h
 }
 
-cygwin32 {
+cygwin {
   dll_ext = .dll
   exe_ext = .exe
   rc      = windres
 }
 
-mingw32 {
+mingw {
   lib_prefix =
   dll_ext    = .dll
   exe_ext    = .exe