Skip to content

Commit 1a9b7c0

Browse files
jwillemsenjwillemsen
committed
More bmake refactoring
 * templates/bmake.mpd: * templates/bmakecommon.mpt:
1 parent 5a611db commit 1a9b7c0

File tree

2 files changed

+15
-84
lines changed

2 files changed

+15
-84
lines changed

‎templates/bmake.mpd‎

Lines changed: 10 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ STARTUP_BITS = <%startup_bits%>
2323
LINK = <%link%>
2424
COMMON_LIBS = <%common_libs%>
2525
TLIB = <%tlib%>
26+
OUTPUT_FLAGS = <%output_flags%>
27+
<%if(pch)%>PCH = 1<%endif%>
2628
!else
2729
<%endfor%>
2830
!error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
@@ -164,22 +166,14 @@ RC_FLAGS = \
164166
<%endif%>
165167
!endif
166168
<%endif%>
167-
<%if(!build64bit)%>
168-
<%if(pch_header)%>
169169

170170
# Borland bcc32 precompiled headers can choke on some header files.
171171
# Set NO_USE_PCH if you do not want to use precompiled headers.
172172
!ifndef NO_USE_PCH
173-
!ifdef CLASSIC
174-
PCH_CFLAGS = \
175-
<%foreach(pch_defines)%>
176-
-D<%pch_define%> \
177-
<%endfor%>
178-
-H=$(INTERMEDIATE)\<%noextension(project_name)%>.csm -Hh=<%pch_header%>
173+
!ifdef PCH
174+
PCH_CFLAGS = <%foreach(pch_defines)%>-D<%pch_define%> <%endfor%>-H=$(INTERMEDIATE)\<%noextension(project_name)%>.csm -Hh=<%pch_header%>
179175
!endif
180176
!endif
181-
<%endif%>
182-
<%endif%>
183177

184178
CFLAGS = \
185179
<%foreach(cflags)%>
@@ -300,104 +294,36 @@ generated: $(GENERATED_DIRTY)
300294
.path$(OBJ_EXT) = $(INTERMEDIATE)
301295

302296
.path.cpp = $(CPPDIR)
303-
<%if(build64bit)%>
304-
.cpp$(OBJ_EXT):
305-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
306-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
307-
<%else%>
308-
!ifdef CLASSIC
309-
.cpp$(OBJ_EXT):
310-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
311-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
312-
!else
313297
.cpp$(OBJ_EXT):
314298
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
315-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
316-
!endif
317-
<%endif%>
299+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
318300

319301
.path.cxx = $(CPPDIR)
320-
<%if(build64bit)%>
321302
.cxx$(OBJ_EXT):
322303
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
323-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
324-
<%else%>
325-
!ifdef CLASSIC
326-
.cxx$(OBJ_EXT):
327-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
328-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
329-
!else
330-
.cxx$(OBJ_EXT):
331-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
332-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
304+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
333305
!endif
334-
<%endif%>
335306

336307
.path.cc = $(CPPDIR)
337-
<%if(build64bit)%>
338-
.cc$(OBJ_EXT):
339-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
340-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
341-
<%else%>
342-
!ifdef CLASSIC
343-
.cc$(OBJ_EXT):
344-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
345-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
346-
!else
347308
.cc$(OBJ_EXT):
348309
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
349-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
350-
!endif
351-
<%endif%>
310+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
352311

353312
.path.C = $(CPPDIR)
354-
<%if(build64bit)%>
355-
.C$(OBJ_EXT):
356-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
357-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
358-
<%else%>
359-
!ifdef CLASSIC
360313
.C$(OBJ_EXT):
361314
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
362-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
363-
!else
364-
.C$(OBJ_EXT):
365-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
366-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
367-
!endif
368-
<%endif%>
315+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
369316

370317
.path.c = $(CPPDIR)
371-
<%if(build64bit)%>
372-
.c$(OBJ_EXT):
373-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
374-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
375-
<%else%>
376-
!ifdef CLASSIC
377-
.c$(OBJ_EXT):
378-
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
379-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -n$(@D) $<
380-
!else
381318
.c$(OBJ_EXT):
382319
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
383-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
384-
!endif
385-
<%endif%>
320+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
386321

387322
<%foreach(source_files)%>
388323
<%if(transdir(source_file) || flag_overrides(source_file, buildflags))%>
389324
"$(INTERMEDIATE)\<%transdir(source_file)%><%basenoextension(source_file)%>$(OBJ_EXT)":
390325
@if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(source_file)%>"
391-
<%if(build64bit)%>
392-
$(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) $(WARNFLAGS) -c -o $(@D)\$(@F) <%source_file%>
393-
<%else%>
394-
!ifdef CLASSIC
395-
$(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) $(WARNFLAGS) -c -n$(@D) <%source_file%>
396-
!else
397-
$(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) $(WARNFLAGS) -c -o $(@D)\$(@F) <%source_file%>
398-
!endif
399-
<%endif%>
400-
326+
$(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) $(WARNFLAGS) -c $(OUTPUT_FLAGS) <%source_file%>
401327
<%endif%>
402328
<%endfor%>
403329
<%if(resource_files)%>

‎templates/bmakecommon.mpt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ startup_bits = 32
3333
link = ilink32
3434
common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
3535
tlib = tlib
36+
output_flags = -n$(@D)
37+
pch = 1
3638
}
3739

3840
bcc32c {
@@ -51,6 +53,7 @@ startup_bits = 32
5153
link = ilink32
5254
common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
5355
tlib = tlib
56+
output_flags = -o $(@D)\$(@F)
5457
}
5558

5659
bcc64 {
@@ -69,6 +72,7 @@ startup_bits = 64
6972
link = ilink64
7073
common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
7174
tlib = tlib64
75+
output_flags = -o $(@D)\$(@F)
7276
}
7377

7478
bcc64x {
@@ -87,4 +91,5 @@ startup_bits = 64
8791
link = ilink64
8892
common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
8993
tlib = tlib64
94+
output_flags = -o $(@D)\$(@F)
9095
}

0 commit comments

Comments
 (0)