Skip to content

Commit 98662e8

Browse files
committed
Fixed warn flags and pch header
* templates/bmake.mpd:
1 parent 1f3ecd7 commit 98662e8

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

templates/bmake.mpd

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,14 @@ RC_FLAGS = \
166166
!endif
167167
<%endif%>
168168

169+
<%if(pch_header)%>
169170
# Set NO_USE_PCH if you do not want to use precompiled headers.
170171
!ifndef NO_USE_PCH
171172
!ifdef PCH
172173
PCH_CFLAGS = <%foreach(pch_defines)%>-D<%pch_define%> <%endfor%>-H=$(INTERMEDIATE)\<%noextension(project_name)%>.csm -Hh=<%pch_header%>
173174
!endif
174175
!endif
176+
<%endif%>
175177

176178
CFLAGS = \
177179
<%foreach(cflags)%>
@@ -294,33 +296,33 @@ generated: $(GENERATED_DIRTY)
294296
.path.cpp = $(CPPDIR)
295297
.cpp$(OBJ_EXT):
296298
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
297-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
299+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
298300

299301
.path.cxx = $(CPPDIR)
300302
.cxx$(OBJ_EXT):
301303
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
302-
$(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) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
303305

304306
.path.cc = $(CPPDIR)
305307
.cc$(OBJ_EXT):
306308
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
307-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
309+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
308310

309311
.path.C = $(CPPDIR)
310312
.C$(OBJ_EXT):
311313
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
312-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
314+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
313315

314316
.path.c = $(CPPDIR)
315317
.c$(OBJ_EXT):
316318
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
317-
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARNFLAGS) -c -o $(@D)\$(@F) $<
319+
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
318320

319321
<%foreach(source_files)%>
320322
<%if(transdir(source_file) || flag_overrides(source_file, buildflags))%>
321323
"$(INTERMEDIATE)\<%transdir(source_file)%><%basenoextension(source_file)%>$(OBJ_EXT)":
322324
@if not exist "$(INTERMEDIATE)\<%transdir(source_file)%>" mkdir "$(INTERMEDIATE)\<%transdir(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%>
325+
$(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%>
324326
<%endif%>
325327
<%endfor%>
326328
<%if(resource_files)%>

0 commit comments

Comments
 (0)