Skip to content

Commit e5cc4f0

Browse files
committed
Updated ghs project generation to fix two issues:
Generated source files could appear twice in the gpj, causing a linker error for multiply-defined symbols. Projects that don't use exeout shouldn't have a / prepended (use local dir)
1 parent 5fb97de commit e5cc4f0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

templates/ghs.mpd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#primaryTarget=<%primaryTarget("ppc_integrity.tgt")%>
33
<%if(exename)%>
44
[Program]
5-
-o <%if(exeout)%><%exeout%><%endif%>/<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>
5+
-o <%if(exeout)%><%exeout%>/<%endif%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>
66
<%if(need_staticflags)%>
77
-non_shared
88
<%endif%>
@@ -135,6 +135,8 @@
135135
<%if(!custom_only && source_files)%>
136136
<%foreach(custom_type->input_file->source_output_files)%>
137137
<%if(forfirst)%>
138+
<%if(remove_from(source_files, \.cpp, custom_type->input_file->source_output_file, \.cpp))%>
139+
<%endif%>
138140
<%custom_type->input_file->source_output_file%>
139141
<%endif%>
140142
<%endfor%>

0 commit comments

Comments
 (0)