Skip to content

Commit 700de10

Browse files
jwillemsenjwillemsen
authored
Merge branch 'master' into jwi-bcc64xpdbl
2 parents ee18005 + b061a4b commit 700de10

File tree

2 files changed

+35
-20
lines changed

2 files changed

+35
-20
lines changed

‎templates/bmake.mpd‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ EXEFLAGS = <%exeflags%>
4242
LINKER_DLL_ARGUMENTS = <%linker_dll_arguments%>
4343
LINKER_EXE_ARGUMENTS = <%linker_exe_arguments%>
4444
DEBUG_EXT = <%debug_ext%>
45+
<%if(parallel_flags)%>PARALLEL_CFLAGS = <%parallel_flags%><%endif%>
4546
!else
4647
<%endfor%>
4748
!error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
@@ -98,6 +99,12 @@ RC = <%rc%>
9899
LIBFLAGS = <%libflags%>
99100
CCFLAGS = $(CC_CFLAGS)<%if(type_is_binary)%> $(BINARY_FLAGS)<%endif%><%if(compile_flags)%> <%compile_flags%><%endif%>
100101

102+
!ifndef MPC_NUMBER_OF_PROCESSORS
103+
MPC_NUMBER_OF_PROCESSORS = 0
104+
!endif
105+
106+
.nosilent
107+
101108
<%if(use_vcl)%>
102109
STARTUP_LETTER = <%if(exename)%>w<%else%><%startup_letter%><%endif%>
103110
<%else%>
@@ -216,8 +223,7 @@ CFLAGS = \
216223
OUTPUTDIR = $(EXEOUTPUTDIR)
217224
all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(EXE_EXT)<%if(postbuild)%> __postbuild__<%endif%>
218225

219-
$(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
220-
@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
226+
$(OUTPUTDIR)$(NAME)$(EXE_EXT): $(INTERMEDIATE) $(OUTPUTDIR) $(OBJFILES) $(RESOURCE)
221227
<%if(prelink)%>
222228
<%eval(prelink)%>
223229
<%endif%>
@@ -231,8 +237,7 @@ $(OUTPUTDIR)$(NAME)$(EXE_EXT): $(OBJFILES) $(RESOURCE)
231237
OUTPUTDIR = <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\\
232238
all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(DLL_EXT)<%if(postbuild)%> __postbuild__<%endif%>
233239

234-
$(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
235-
@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
240+
$(OUTPUTDIR)$(NAME)$(DLL_EXT): $(INTERMEDIATE) $(OUTPUTDIR) $(OBJFILES) $(RESOURCE)
236241
<%if(prelink)%>
237242
<%eval(prelink)%>
238243
<%endif%>
@@ -247,8 +252,7 @@ $(OUTPUTDIR)$(NAME)$(DLL_EXT): $(OBJFILES) $(RESOURCE)
247252
OUTPUTDIR = <%libout%>\\
248253
all:<%if(prebuild)%> __prebuild__<%endif%> $(OUTPUTDIR)$(NAME)$(LIB_EXT)<%if(postbuild)%> __postbuild__<%endif%>
249254

250-
$(OUTPUTDIR)$(NAME)$(LIB_EXT): $(OBJFILES)
251-
@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
255+
$(OUTPUTDIR)$(NAME)$(LIB_EXT): $(INTERMEDIATE) $(OUTPUTDIR) $(OBJFILES)
252256
$(TLIB) $(LIBFLAGS) $(OUTPUTDIR)$(NAME)$(LIB_EXT) @&&!
253257
+ $(**: = &^
254258
+ )
@@ -312,37 +316,47 @@ all:<%if(prebuild)%> __prebuild__<%endif%> $(GENERATED_DIRTY)<%if(postbuild)%> _
312316
generated: $(GENERATED_DIRTY)
313317
@-rem
314318

319+
$(INTERMEDIATE):
320+
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
321+
322+
<%if(exename || sharedname || staticname)%>
323+
$(OUTPUTDIR):
324+
@if not exist "$(OUTPUTDIR)" mkdir "$(OUTPUTDIR)"
325+
<%endif%>
326+
315327
.path$(OBJ_EXT) = $(INTERMEDIATE)
316328

329+
!ifdef PARALLEL_CFLAGS
317330
.path.cpp = $(CPPDIR)
318331
.cpp$(OBJ_EXT):
319-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
320-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
332+
$(CC) $(PARALLEL_CFLAGS) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -output-dir $(@D) -c {$? }
333+
334+
!else
335+
.path.cpp = $(CPPDIR)
336+
.cpp$(OBJ_EXT):
337+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
338+
!endif
321339

322340
.path.cxx = $(CPPDIR)
323341
.cxx$(OBJ_EXT):
324-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
325-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
342+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
326343

327344
.path.cc = $(CPPDIR)
328345
.cc$(OBJ_EXT):
329-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
330-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
346+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
331347

332348
.path.C = $(CPPDIR)
333349
.C$(OBJ_EXT):
334-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
335-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
350+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
336351

337352
.path.c = $(CPPDIR)
338353
.c$(OBJ_EXT):
339-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
340-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
354+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
341355

342356
<%foreach(source_files)%>
343357
<%if(transdir(source_file) || flag_overrides(source_file, buildflags))%>
344358
"$(INTERMEDIATE)\<%transdir(source_file)%><%basenoextension(source_file)%>$(OBJ_EXT)":
345-
@if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(source_file)%>"
359+
if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(source_file)%>"
346360
$(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%>
347361
<%endif%>
348362
<%endfor%>
@@ -351,12 +365,12 @@ generated: $(GENERATED_DIRTY)
351365
.path.res = $(INTERMEDIATE)
352366
.path.rc = $(RESDIR)
353367
.rc.res:
354-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
355-
$(RC) $(RC_FLAGS) -fo$@ $<
368+
if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
369+
$(RC) $(RC_FLAGS) -fo$@ $<
356370
<%foreach(resource_files)%>
357371
<%if(transdir(resource_file))%>
358372
"$(INTERMEDIATE)\<%transdir(resource_file)%><%basenoextension(resource_file)%>.res":
359-
@if not exist "$(INTERMEDIATE)\<%transdir(resource_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(resource_file)%>"
373+
if not exist "$(INTERMEDIATE)\<%transdir(resource_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(resource_file)%>"
360374
$(RC) -fo$@ <%resource_file%>
361375
<%endif%>
362376
<%endfor%>

‎templates/bmakecommon.mpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,5 @@ exeflags = -tR
140140
object_search_path = 0
141141
linker_dll_arguments = $(DLLFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
142142
linker_exe_arguments = $(EXEFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
143+
parallel_flags = --jobs=$(MPC_NUMBER_OF_PROCESSORS)
143144
}

0 commit comments

Comments
 (0)