Merge pull request DOCGroup#186 from jwillemsen/jwi-bmake

Refactored Embarcadero C++ Builder support

Author: jwillemsen

templates/bmake.mpd

@@ -6,11 +6,34 @@
 #
 #----------------------------------------------------------------------------
 <%marker(top)%>
+<%foreach(compilers)%>
+!ifdef <%normalize(uc(compiler))%>
+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%>
+COMMON_DEFINES =<%foreach(common_defines)%> -D<%common_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%>
+<%if(pch)%>PCH = 1<%endif%>
+!else
+<%endfor%>
+!error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
+<%foreach(compilers)%>
+!endif
+<%endfor%>
+
 <%foreach(configurations)%>
 !ifdef <%normalize(uc(configuration))%>
-OCFLAGS32    = <%if(optimize)%>-O1<%else%><%if(debug_prj)%>-v -y -Od -vi- -k<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
-OCFLAGS32C   = <%if(optimize)%>-O3<%else%><%if(debug_prj)%>-Od -vi- <%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
-OCFLAGS64    = <%if(optimize)%>-O3<%else%><%if(debug_prj)%>-g -O0 <%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
+OCFLAGS    = <%if(optimize)%>$(OPTIMIZE_CFLAGS)<%else%><%if(debug_prj)%> $(DEBUG_CFLAGS)<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%>
 CFG_DIR      = <%intermediate_dir%>\\
 LIBMODIFIER  = <%if(use_lib_modifier)%><%lib_modifier%><%endif%>
 EXEMODIFIER  = <%if(use_exe_modifier)%><%lib_modifier%><%endif%>
@@ -54,43 +77,11 @@ CG_LIB    = cg32.lib
 
 DLL_EXT      = <%dll_ext%>
 EXE_EXT      = <%exe_ext%>
-<%if(build64bit)%>
-STARTUP_BITS = 64
-CC64         = <%cc64%>
-LINK64       = <%link64%>
-LIB_EXT      = <%lib64_ext%>
-OBJ_EXT      = <%obj64_ext%>
-THREADFLAGS  = <%thrflags64%>
-BINARYFLAGS  = <%binaryflags64%>
-LINKERPATHS  = -L"$(BDS)\lib\win64\debug" -L"$(BDS)\lib\win64\release" -GE:HIGHENTROPYVA=off
-WARNFLAGS64  = <%warnflags64%>
-<%else%>
-LINK32       = <%link32%>
-STARTUP_BITS = 32
-!ifdef CLASSIC
-CC32         = <%cc32%>
-LIB_EXT      = <%lib32_ext%>
-OBJ_EXT      = <%obj32_ext%>
-THREADFLAGS  = <%thrflags32%>
-BINARYFLAGS  = <%binaryflags32%>
-LINKERPATHS  = -L"$(BDS)\lib\win32\release" -L"$(BDS)\lib\win32\debug"
-WARNFLAGS32  = <%warnflags32%>
-!else
-CC32C        = <%cc32c%>
-LIB_EXT      = <%lib32c_ext%>
-OBJ_EXT      = <%obj32c_ext%>
-THREADFLAGS  = <%thrflags32c%>
-BINARYFLAGS  = <%binaryflags32c%>
-LINKERPATHS  = -L"$(BDS)\lib\win32c\debug" -L"$(BDS)\lib\win32c\release"
-WARNFLAGS32C = <%warnflags32c%>
-!endif
-<%endif%>
 RC           = <%rc%>
-TLIB32       = <%tlib32%>
 DLLFLAGS     = <%dllflags%>
 LIBFLAGS     = <%libflags%>
 EXEFLAGS     = <%exeflags%>
-CCFLAGS      = <%ccflags%><%if(type_is_binary)%> $(BINARYFLAGS)<%endif%><%if(compile_flags)%> <%compile_flags%><%endif%>
+CCFLAGS      = <%ccflags%><%if(type_is_binary)%> $(BINARY_FLAGS)<%endif%><%if(compile_flags)%> <%compile_flags%><%endif%>
 
 <%if(use_vcl)%>
 STARTUP_LETTER = <%if(exename)%>w<%else%><%startup_letter%><%endif%>
@@ -124,7 +115,7 @@ OBJFILES = \
 <%if(libpaths)%>
 
 LFLAGS   = \
-           $(LINKERPATHS) \
+           $(LINKER_PATHS) \
 <%if(debug_prj)%>
            -v \
            -r \
@@ -146,16 +137,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) \
@@ -184,66 +165,15 @@ RC_FLAGS = \
 <%endif%>
 !endif
 <%endif%>
-<%if(!build64bit)%>
-<%if(pch_header)%>
 
-# Borland bcc32 precompiled headers can choke on some header files.
+<%if(pch_header)%>
 # Set NO_USE_PCH if you do not want to use precompiled headers.
 !ifndef NO_USE_PCH
-!ifdef CLASSIC
-PCH_CFLAGS = \
-<%foreach(pch_defines)%>
-             -D<%pch_define%> \
-<%endfor%>
-             -H=$(INTERMEDIATE)\<%noextension(project_name)%>.csm -Hh=<%pch_header%>
+!ifdef PCH
+PCH_CFLAGS = <%foreach(pch_defines)%>-D<%pch_define%> <%endfor%>-H=$(INTERMEDIATE)\<%noextension(project_name)%>.csm -Hh=<%pch_header%>
 !endif
 !endif
 <%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%>
-
-<%if(build64bit)%>
-<%if(common64_defines)%>
-COMMON_DEFINES = \
-<%foreach(common64_defines)%>
-         -D<%common64_define%><%fornotlast(" \\")%>
-<%endfor%>
-<%endif%>
-<%else%>
-!ifdef CLASSIC
-<%if(common32_defines)%>
-COMMON_DEFINES = \
-<%foreach(common32_defines)%>
-         -D<%common32_define%><%fornotlast(" \\")%>
-<%endfor%>
-<%endif%>
-!else
-<%if(common32c_defines)%>
-COMMON_DEFINES = \
-<%foreach(common32c_defines)%>
-         -D<%common32c_define%><%fornotlast(" \\")%>
-<%endfor%>
-<%endif%>
-!endif
-<%endif%>
 
 CFLAGS = \
 <%foreach(cflags)%>
@@ -270,11 +200,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)
 !
 
@@ -289,11 +215,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
@@ -306,7 +228,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) @&&!
 + $(**: = &^
 + )
 !
@@ -372,121 +294,49 @@ generated: $(GENERATED_DIRTY)
 .path$(OBJ_EXT) = $(INTERMEDIATE)
 
 .path.cpp = $(CPPDIR)
-<%if(build64bit)%>
 .cpp$(OBJ_EXT):
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC64) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) $<
-<%else%>
-!ifdef CLASSIC
-.cpp$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) $<
-!else
-.cpp$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32C) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) $<
-!endif
-<%endif%>
+        $(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
 
 .path.cxx = $(CPPDIR)
-<%if(build64bit)%>
 .cxx$(OBJ_EXT):
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC64) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) $<
-<%else%>
-!ifdef CLASSIC
-.cxx$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) $<
-!else
-.cxx$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32C) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) $<
-!endif
-<%endif%>
+        $(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
 
 .path.cc = $(CPPDIR)
-<%if(build64bit)%>
-.cc$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC64) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) $<
-<%else%>
-!ifdef CLASSIC
 .cc$(OBJ_EXT):
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) $<
-!else
-.cc$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32C) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) $<
-!endif
-<%endif%>
+        $(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
 
 .path.C = $(CPPDIR)
-<%if(build64bit)%>
-.C$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC64) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) $<
-<%else%>
-!ifdef CLASSIC
-.C$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) $<
-!else
 .C$(OBJ_EXT):
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32C) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) $<
-!endif
-<%endif%>
+        $(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
 
 .path.c = $(CPPDIR)
-<%if(build64bit)%>
-.c$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC64) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) $<
-<%else%>
-!ifdef CLASSIC
-.c$(OBJ_EXT):
-  @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) $<
-!else
 .c$(OBJ_EXT):
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
-        $(CC32C) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) $<
-!endif
-<%endif%>
+        $(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
 
 <%foreach(source_files)%>
 <%if(transdir(source_file) || flag_overrides(source_file, buildflags))%>
 "$(INTERMEDIATE)\<%transdir(source_file)%><%basenoextension(source_file)%>$(OBJ_EXT)":
   @if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(source_file)%>"
-<%if(build64bit)%>
-  $(CC64) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS64) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS64) -c -o $(@D)\$(@F) <%source_file%>
-<%else%>
-!ifdef CLASSIC
-  $(CC32) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32) -c -n$(@D) <%source_file%>
-!else
-  $(CC32C) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS32C) $(CG_CFLAGS) $(UC_CFLAGS) $(THREADFLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS32C) -c -o $(@D)\$(@F) <%source_file%>
-!endif
-<%endif%>
-
+  $(CC) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%>$(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) <%source_file%>
 <%endif%>
 <%endfor%>
 <%if(resource_files)%>
 !ifndef STATIC_CFG
 .path.res = $(INTERMEDIATE)
-
 .path.rc = $(RESDIR)
 .rc.res:
   @if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
         $(RC) $(RC_FLAGS) -fo$@ $<
-
 <%foreach(resource_files)%>
 <%if(transdir(resource_file))%>
 "$(INTERMEDIATE)\<%transdir(resource_file)%><%basenoextension(resource_file)%>.res":
   @if not exist "$(INTERMEDIATE)\<%transdir(resource_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(resource_file)%>"
   $(RC) -fo$@ <%resource_file%>
-
 <%endif%>
 <%endfor%>
 !endif