Skip to content

Commit 938acba

Browse files
committed
Get rid of output_flags
* templates/bmake.mpd: * templates/bmakecommon.mpt:
1 parent d1b44da commit 938acba

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

templates/bmake.mpd

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ STARTUP_BITS = <%startup_bits%>
2323
LINK = <%link%>
2424
COMMON_LIBS = <%common_libs%>
2525
TLIB = <%tlib%>
26-
OUTPUT_FLAGS = <%output_flags%>
2726
<%if(pch)%>PCH = 1<%endif%>
2827
!else
2928
<%endfor%>
@@ -295,33 +294,33 @@ generated: $(GENERATED_DIRTY)
295294
.path.cpp = $(CPPDIR)
296295
.cpp$(OBJ_EXT):
297296
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
298-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
297+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
299298

300299
.path.cxx = $(CPPDIR)
301300
.cxx$(OBJ_EXT):
302301
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
303-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
302+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
304303

305304
.path.cc = $(CPPDIR)
306305
.cc$(OBJ_EXT):
307306
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
308-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
307+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
309308

310309
.path.C = $(CPPDIR)
311310
.C$(OBJ_EXT):
312311
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
313-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
312+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
314313

315314
.path.c = $(CPPDIR)
316315
.c$(OBJ_EXT):
317316
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
318-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c $(OUTPUT_FLAGS) $<
317+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
319318

320319
<%foreach(source_files)%>
321320
<%if(transdir(source_file) || flag_overrides(source_file, buildflags))%>
322321
"$(INTERMEDIATE)\<%transdir(source_file)%><%basenoextension(source_file)%>$(OBJ_EXT)":
323322
@if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(source_file)%>"
324-
$(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%>
323+
$(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%>
325324
<%endif%>
326325
<%endfor%>
327326
<%if(resource_files)%>

templates/bmakecommon.mpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ 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)
3736
pch = 1
3837
}
3938

@@ -53,7 +52,6 @@ startup_bits = 32
5352
link = ilink32
5453
common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
5554
tlib = tlib
56-
output_flags = -o $(@D)\$(@F)
5755
}
5856

5957
bcc64 {
@@ -72,7 +70,6 @@ startup_bits = 64
7270
link = ilink64
7371
common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
7472
tlib = tlib64
75-
output_flags = -o $(@D)\$(@F)
7673
}
7774

7875
bcc64x {
@@ -91,5 +88,4 @@ startup_bits = 64
9188
link = ilink64
9289
common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
9390
tlib = tlib64
94-
output_flags = -o $(@D)\$(@F)
9591
}

0 commit comments

Comments
 (0)