ChangeLogTag: Sun Aug 1 15:13:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 71 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 803d15ed..80f3cbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Sun Aug  1 15:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * templates/bmake.mpd:
+          Use the new ccflags, common_flags and warnflags. Tried to add
+          some support for unicode builds, this is not complete yet, added
+          "" around the objfiles, to handle ++ in directory/file names. Added
+          setting of define ACE_LD_DECORATOR_STR, which is used in ACE to
+          determine the filename extension of DLL's. Removed the removal
+          of files with postlinkrmext extenion (is .tds) files after the
+          link, instead do this with realclean.
+
+        * templates/bmakecommon.mpt:
+          Updated dllflags, common_defines, added ccflags,
+          common_flags, and warnflags which have to be passed
+          to the compiler
+
+        * templates/bmakedll.mpt:
+        * templates/bmakedllexe.mpt:
+        * templates/bmakelibexe.mpt:
+          Set postlinkrmext to .tds in all these files, we should
+          rework this a little bit more, tds files are needed for
+          the debugger and we shouldn't remove them after the link.
+
+          The bmake target is not complete yet, things that have to be
+          improved are startup objects (gperf just cores now),
+           unicode support, codeguard support, install target, clean target.
+
 Wed Jul 28 20:01:36 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * templates/automake.mpd: Emit a _LDFLAGS definition if linkflags
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
index 89fd8cc2..adf24875 100644
--- a/templates/bmake.mpd
+++ b/templates/bmake.mpd
@@ -38,6 +38,8 @@ THREADFLAGS  = <%thflags%>
 DLLFLAGS     = <%dllflags%>
 LIBFLAGS     = <%libflags%>
 EXEFLAGS     = <%exeflags%>
+WARNFLAGS    = <%warnflags%>
+CCFLAGS      = <%ccflags%>
 <%endfor%>
 <%if(exename)%>
 NAME         = <%exename%>$(EXEMODIFIER)
@@ -51,11 +53,13 @@ NAME         = <%staticname%>$(LIBMODIFIER)
 <%endif%>
 <%endif%>
 CPPDIR       = <%cppdir%>
+UNICODE_CFLAGS = -DACE_USES_WCHAR -WU
+
 <%if(exename || sharedname || staticname)%>
 
 OBJFILES = \
 <%foreach(source_files)%>
-           $(INTERMEDIATE)\<%basenoextension(source_file)%>$(OBJ_EXT)<%fornotlast(" \\")%>
+           "$(INTERMEDIATE)\<%basenoextension(source_file)%>$(OBJ_EXT)"<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
 <%if(libpaths)%>
@@ -79,7 +83,6 @@ LIBFILES = \
            <%common_libs%>
 
 <%if(resource_files && !type_is_static)%>
-
 RESOURCE = \
 <%foreach(resource_files)%>
            $(INTERMEDIATE)\<%noextension(resource_file)%>.res<%fornotlast(" \\")%>
@@ -87,18 +90,22 @@ RESOURCE = \
 <%endif%>
 
 CFLAGS = \
+          -DACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\"$(LIBMODIFIER)\") \
 <%if(pch_header)%>
 <%foreach(pch_defines)%>
 # Borland precompiled headers choke on some header files.
 #         -D<%pch_define%> \
 <%endfor%>
 <%endif%>
+<%foreach(cc_flags)%>
+         <%cc_flags%> \
+<%endfor%>
+<%foreach(common_flags)%>
+         <%common_flags%> \
+<%endfor%>
 <%foreach(macros common_defines)%>
          -D<%macro%> \
 <%endfor%>
-<%foreach(includes)%>
-         -I"<%include%>" \
-<%endfor%>
 <%if(type_is_static || need_staticflags)%>
 <%if(staticflags)%>
 <%foreach(staticflags)%>
@@ -112,6 +119,9 @@ CFLAGS = \
 <%endfor%>
 <%endif%>
 <%endif%>
+<%foreach(includes)%>
+         -I"<%include%>" \
+<%endfor%>
          $(DUMMY_VALUE_NOT_ENDING_IN_BACKSLASH)
 
 <%if(pch_header)%>
@@ -167,9 +177,6 @@ $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
 	$(LINK) @&&!
 	$(EXEFLAGS) $(LFLAGS) <%startup_obj%> $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 !
-!ifdef POSTLINKRM
-	if exist "$(OUTPUTDIR)$(NAME)$(POSTLINKRM)" del $(OUTPUTDIR)$(NAME)$(POSTLINKRM)
-!endif
 
 <%endif%>
 <%if(sharedname)%>
@@ -181,9 +188,6 @@ $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
 	$(LINK) @&&!
 	$(DLLFLAGS) $(LFLAGS) <%startup_obj%> $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
 !
-!ifdef POSTLINKRM
-	del $(OUTPUTDIR)$(NAME)$(POSTLINKRM)
-!endif
 
 <%endif%>
 <%if(type_is_static)%>
@@ -205,27 +209,27 @@ $(OUTPUTDIR)$(NAME)$(LIB_EXT): $(OBJFILES)
 .path.cpp = $(CPPDIR)
 .cpp$(OBJ_EXT):
 	@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-	$(CC) $(OCFLAGS) $(THREADFLAGS) $(CFLAGS) -c -n$(@D) $<
+        $(CC) $(OCFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
 
 .path.cxx = $(CPPDIR)
 .cxx$(OBJ_EXT):
 	@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-	$(CC) $(OCFLAGS) $(THREADFLAGS) $(CFLAGS) -c -n$(@D) $<
+        $(CC) $(OCFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
 
 .path.cc = $(CPPDIR)
 .cc$(OBJ_EXT):
 	@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-	$(CC) $(OCFLAGS) $(THREADFLAGS) $(CFLAGS) -c -n$(@D) $<
+        $(CC) $(OCFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
 
 .path.C = $(CPPDIR)
 .C$(OBJ_EXT):
 	@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-	$(CC) $(OCFLAGS) $(THREADFLAGS) $(CFLAGS) -c -n$(@D) $<
+        $(CC) $(OCFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
 
 .path.c = $(CPPDIR)
 .c$(OBJ_EXT):
 	@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-	$(CC) $(OCFLAGS) $(THREADFLAGS) $(CFLAGS) -c -n$(@D) $<
+        $(CC) $(OCFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
 
 <%if(resource_files && !type_is_static)%>
 .path.res = $(INTERMEDIATE)
@@ -248,8 +252,9 @@ realclean: clean
 <%else%>
 	if exist "$(OUTPUTDIR)$(NAME)$(LIB_EXT)" del $(OUTPUTDIR)$(NAME)$(LIB_EXT)
 <%endif%>
+        if exist "$(OUTPUTDIR)$(NAME)$(POSTLINKRM)" del $(OUTPUTDIR)$(NAME)$(POSTLINKRM)
 <%if(sharedname)%>
-	if exist "$(OUTPUTDIR)$(NAME)$(DLL_EXT)" del $(OUTPUTDIR)$(NAME)$(DLL_EXT)
+                if exist "$(OUTPUTDIR)$(NAME)$(DLL_EXT)" del $(OUTPUTDIR)$(NAME)$(DLL_EXT)
 <%endif%>
 
 <%marker(bottom)%>
diff --git a/templates/bmakecommon.mpt b/templates/bmakecommon.mpt
index 9aa50c35..e1af917a 100644
--- a/templates/bmakecommon.mpt
+++ b/templates/bmakecommon.mpt
@@ -5,8 +5,9 @@ conditional_include "common"
 
 configurations        = Debug Release
 compilers             = bcc
-common_defines        = WIN32 _WINDOWS
+common_defines        = WIN32 _WINDOWS _NO_VCL
 common_libs           = import32$(LIB_EXT) cw32mt.lib ws2_32.lib
+common_flags          = -a8
 
 bcc {
   obj_ext = .obj
@@ -18,22 +19,26 @@ bcc {
   tlib    = tlib
   link    = ilink32
   thflags = -D_MT -tWM
-  dllflags = -Tpd -Gi -x -Gn
+  dllflags = -Tpd -Gi -x -Gn -w-dup
   libflags = /C
+  ccflags  = -q
   exeflags = -Tpe -x -Gn
+  warnflags = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl
 }
 
 cbx {
-  obj_ext = .o
-  dll_ext = .dll
-  lib_ext = .a
-  exe_ext = .exe
-  cc      = bccx
-  rc      = brcc32
-  tlib    = ar
-  link    = ilink
-  thflags = -D_MT -tWM
-  dllflags = -Tpd -Gi -x -Gn
-  libflags = cfrv
-  exeflags = -Tpe -x -Gn
+  obj_ext   = .o
+  dll_ext   = .dll
+  lib_ext   = .a
+  exe_ext   = .exe
+  cc        = bccx
+  rc        = brcc32
+  tlib      = ar
+  link      = ilink
+  thflags   = -D_MT -tWM
+  dllflags  = -Tpd -Gi -x -Gn -w-dup
+  libflags  = cfrv
+  ccflags   = -b
+  exeflags  = -Tpe -x -Gn
+  warnflags = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl
 }
diff --git a/templates/bmakedll.mpt b/templates/bmakedll.mpt
index 74482ac1..44db8533 100644
--- a/templates/bmakedll.mpt
+++ b/templates/bmakedll.mpt
@@ -17,4 +17,5 @@ Debug {
   defines          = _DEBUG
   intermediate_dir = Debug
   lib_modifier     = d
+  postlinkrmext    = .tds
 }
diff --git a/templates/bmakedllexe.mpt b/templates/bmakedllexe.mpt
index a77675d7..ea1a8163 100644
--- a/templates/bmakedllexe.mpt
+++ b/templates/bmakedllexe.mpt
@@ -20,4 +20,5 @@ Debug {
   exeoutputdir     = .
   intermediate_dir = Debug
   lib_modifier     = d
+  postlinkrmext    = .tds
 }
diff --git a/templates/bmakelibexe.mpt b/templates/bmakelibexe.mpt
index fea16429..14ba480c 100644
--- a/templates/bmakelibexe.mpt
+++ b/templates/bmakelibexe.mpt
@@ -22,5 +22,6 @@ Debug {
   exeoutputdir     = Static_Debug
   intermediate_dir = Static_Debug
   lib_modifier     = sd
+  postlinkrmext    = .tds
 }