Work in progress for bcc64x

Author: jwillemsen

templates/bmake.mpd

@@ -32,6 +32,8 @@ OBJECTSEARCHPATH = \
    -j"<%libpath%>"<%fornotlast(" \\")%>
 <%endfor%>
 <%endif%>
+LINKER_DLL_ARGUMENTS = <%linker_dll_arguments%>
+LINKER_EXE_ARGUMENTS = <%linker_exe_arguments%>
 !else
 <%endfor%>
 !error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
@@ -209,7 +211,7 @@ $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
   <%eval(prelink)%>
 <%endif%>
   $(LINK) @&&!
-  $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
+  $(LINKER_EXE_ARGUMENTS)
 !
 
 <%endif%>
@@ -224,7 +226,7 @@ $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
   <%eval(prelink)%>
 <%endif%>
   $(LINK) @&&!
-  $(DLLFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
+  $(LINKER_DLL_ARGUMENTS)
 !
 !endif
 

templates/bmakecommon.mpt

@@ -35,6 +35,8 @@ pch = 1
 ccflags = -q
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
+linker_dll_arguments = $(DLLFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
+linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 }
 
 bcc32c {
@@ -56,6 +58,8 @@ tlib = tlib
 ccflags = -q
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
+linker_dll_arguments = $(DLLFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
+linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 }
 
 bcc64 {
@@ -77,6 +81,8 @@ tlib = tlib64
 ccflags = -q
 dllflags = -Tpd -Gi -x -Gn -w-dup
 object_search_path = 1
+linker_dll_arguments = $(DLLFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(DLL_EXT),, $(LIBFILES),, $(RESOURCE)
+linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 }
 
 bcc64x {
@@ -98,4 +104,6 @@ common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
 tlib = tlib64
 dllflags = -m i386pep -shared --Bstatic --entry DllMainCRTStartup --enable-auto-image-base
 object_search_path = 0
+linker_dll_arguments = $(DLLFLAGS) $(LFLAGS) $(OBJFILES) $(OUTPUTDIR)$(NAME)$(DLL_EXT) $(LIBFILES) $(RESOURCE)
+linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(STARTUP_OBJ) $(OBJFILES), $(OUTPUTDIR)$(NAME)$(EXE_EXT),, $(LIBFILES),, $(RESOURCE)
 }