More bmake refactoring

    * templates/bmake.mpd:
    * templates/bmakecommon.mpt:

Author: jwillemsen

templates/bmake.mpd

@@ -12,10 +12,17 @@ CC = <%cc%>
 OPTIMIZE_CFLAGS = <%optimize_flags%>
 DEBUG_CFLAGS = <%debug_flags%>
 WARN_FLAGS = <%warn_flags%>
-BINARY_FLAGS  = <%binary_flags%>
-THREAD_FLAGS  = <%thr_flags%>
-LIB_EXT      = <%lib_ext%>
+BINARY_FLAGS = <%binary_flags%>
+THREAD_FLAGS = <%thr_flags%>
+LIB_EXT = <%lib_ext%>
 COMMON_DEFINES =<%foreach(common_defines)%> -D<%common64_define%><%endfor%>
+COMMON_FLAGS = <%foreach(common_flags)%><%common_flag%><%endfor%>
+OBJ_EXT = <%obj_ext%>
+LINKER_PATHS = <%linker_paths%>
+STARTUP_BITS = <%startup_bits%>
+LINK = <%link%>
+COMMON_LIBS = <%common_libs%>
+TLIB = <%tlib%>
 !else
 <%endfor%>
 !error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
@@ -69,25 +76,7 @@ CG_LIB    = cg32.lib
 
 DLL_EXT      = <%dll_ext%>
 EXE_EXT      = <%exe_ext%>
-<%if(build64bit)%>
-STARTUP_BITS = 64
-LINK64       = <%link64%>
-
-OBJ_EXT      = <%obj64_ext%>
-LINKERPATHS  = -L"$(BDS)\lib\win64\debug" -L"$(BDS)\lib\win64\release" -GE:HIGHENTROPYVA=off
-<%else%>
-LINK32       = <%link32%>
-STARTUP_BITS = 32
-!ifdef CLASSIC
-OBJ_EXT      = <%obj32_ext%>
-LINKERPATHS  = -L"$(BDS)\lib\win32\release" -L"$(BDS)\lib\win32\debug"
-!else
-OBJ_EXT      = <%obj32c_ext%>
-LINKERPATHS  = -L"$(BDS)\lib\win32c\debug" -L"$(BDS)\lib\win32c\release"
-!endif
-<%endif%>
 RC           = <%rc%>
-TLIB32       = <%tlib32%>
 DLLFLAGS     = <%dllflags%>
 LIBFLAGS     = <%libflags%>
 EXEFLAGS     = <%exeflags%>
@@ -125,7 +114,7 @@ OBJFILES = \
 <%if(libpaths)%>
 
 LFLAGS   = \
-           $(LINKERPATHS) \
+           $(LINKER_PATHS) \
 <%if(debug_prj)%>
            -v \
            -r \
@@ -147,16 +136,6 @@ LFLAGS   = \
 <%endfor%>
 <%endif%>
 
-<%if(build64bit)%>
-COMMON_LIBS = <%common_libs%> <%common64_libs%>
-<%else%>
-!ifdef CLASSIC
-COMMON_LIBS = $(CG_LIB) <%common_libs%> <%common32_libs%>
-!else
-COMMON_LIBS = <%common_libs%> <%common32c_libs%>
-!endif
-<%endif%>
-
 LIBFILES = \
 <%foreach(reverse(libs))%>
            <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
@@ -202,25 +181,6 @@ PCH_CFLAGS = \
 <%endif%>
 <%endif%>
 
-<%if(build64bit)%>
-COMMON_FLAGS = \
-<%foreach(common64_flags)%>
-         <%common64_flag%><%fornotlast(" \\")%>
-<%endfor%>
-<%else%>
-!ifdef CLASSIC
-COMMON_FLAGS = \
-<%foreach(common32_flags)%>
-         <%common32_flag%><%fornotlast(" \\")%>
-<%endfor%>
-!else
-COMMON_FLAGS = \
-<%foreach(common32c_flags)%>
-         <%common32c_flag%><%fornotlast(" \\")%>
-<%endfor%>
-!endif
-<%endif%>
-
 CFLAGS = \
 <%foreach(cflags)%>
          <%cflag%> \
@@ -246,11 +206,7 @@ $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
 <%if(prelink)%>
   <%eval(prelink)%>
 <%endif%>
-<%if(build64bit)%>
-  $(LINK64) @&&!
-<%else%>
-  $(LINK32) @&&!
-<%endif%>
+  $(LINK) @&&!
   $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 !
 
@@ -265,11 +221,7 @@ $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
 <%if(prelink)%>
   <%eval(prelink)%>
 <%endif%>
-<%if(build64bit)%>
-  $(LINK64) @&&!
-<%else%>
-  $(LINK32) @&&!
-<%endif%>
+  $(LINK) @&&!
   $(DLLFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
 !
 !endif
@@ -282,7 +234,7 @@ all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(LIB_EXT)<%if(pos
 
 $(OUTPUTDIR)$(NAME)$(LIB_EXT): $(OBJFILES)
   @if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
-  $(TLIB32) $(LIBFLAGS) $(OUTPUTDIR)$(NAME)$(LIB_EXT) @&&!
+  $(TLIB) $(LIBFLAGS) $(OUTPUTDIR)$(NAME)$(LIB_EXT) @&&!
 + $(**: = &^
 + )
 !

templates/bmakecommon.mpt

@@ -7,28 +7,12 @@ conditional_include "common"
 configurations       = Debug Release
 compilers            = bcc32 bcc32c bcc64 bcc64x
 common_defines       =
-common_libs          = ws2_32$(LIB_EXT)
-common32_libs        = import32$(LIB_EXT) cw32mti$(LIB_EXT)
-common32c_libs       = import32$(LIB_EXT) cw32mti$(LIB_EXT)
-common64_libs        = import64$(LIB_EXT) cw64mti$(LIB_EXT)
-common32_flags       = -a8
-common32c_flags      = -a8
-common64_flags       =
 unicode_flags        = -WU
 unicode_lib_modifier = u
 unicode_exe_modifier = u
-
-obj32_ext = .obj
-obj32c_ext = .obj
-obj64_ext = .o
 dll_ext = .dll
 exe_ext = .exe
-
-rc      = brcc32
-link32  = ilink32
-link64  = ilink64
-tlib32  = tlib
-tlib64  = tlib64
+rc = brcc32
 dllflags = -Tpd -Gi -x -Gn -w-dup
 libflags = /C
 ccflags  = -q
@@ -42,6 +26,13 @@ cc = bcc32
 binary_flags = -tWR -tWD
 lib_ext = .lib
 common_defines = WIN32 _WINDOWS
+common_flags = -a8
+obj_ext = .obj
+linker_paths = -L"$(BDS)\lib\win32\release" -L"$(BDS)\lib\win32\debug"
+startup_bits = 32
+link = ilink32
+common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
+tlib = tlib
 }
 
 bcc32c {
@@ -53,6 +44,13 @@ binary_flags = -tR -tD
 thr_flags = -tWM
 lib_ext = .lib
 common_defines = WIN32 _WINDOWS
+common_flags = -a8
+obj_ext = .obj
+linker_paths = -L"$(BDS)\lib\win32c\debug" -L"$(BDS)\lib\win32c\release"
+startup_bits = 32
+link = ilink32
+common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
+tlib = tlib
 }
 
 bcc64 {
@@ -64,6 +62,13 @@ binary_flags = -tR -tD
 thr_flags = -tM
 lib_ext = .a
 common_defines = WIN32 _WINDOWS WIN64
+common64_flags =
+obj_ext = .o
+linker_paths = -L"$(BDS)\lib\win64\debug" -L"$(BDS)\lib\win64\release" -GE:HIGHENTROPYVA=off
+startup_bits = 64
+link = ilink64
+common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
+tlib = tlib64
 }
 
 bcc64x {
@@ -75,4 +80,11 @@ binary_flags = -tR -tD
 thr_flags = -tM
 lib_ext = .a
 common_defines = WIN32 _WINDOWS WIN64
+common64_flags =
+obj_ext = .o
+linker_paths = -L"$(BDS)\lib\win64x\debug" -L"$(BDS)\lib\win64x\release"
+startup_bits = 64
+link = ilink64
+common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
+tlib = tlib64
 }