diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-04-16 15:01:14 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-04-16 15:01:14 +0000 |
commit | 87291e846f4254ca9469fbf91640bcbc5b2458ae (patch) | |
tree | 518c744d7ed92110af2204c35b599be255ae0d53 /templates/make.mpd | |
parent | 4f4fe44e6a89695c186126890f4e18ca7e978c0e (diff) | |
download | MPC-87291e846f4254ca9469fbf91640bcbc5b2458ae.tar.gz |
ChangeLogTag: Mon Apr 16 15:00:49 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'templates/make.mpd')
-rw-r--r-- | templates/make.mpd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/make.mpd b/templates/make.mpd index b7889042..9385be89 100644 --- a/templates/make.mpd +++ b/templates/make.mpd @@ -38,7 +38,7 @@ CPU = <%cpu%> <%if(dll_ext && pic)%> PICFLAGS = <%pic%> <%endif%> -CPPFLAGS = <%if(visibility && visopt)%><%visopt%> <%endif%>$(PICFLAGS) $(GENFLAGS)<%if(compile_flags)%> <%compile_flags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempincopt)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%if(compilerflags)%> <%compilerflags%><%endif%><%if(build64bit && compilerflags64)%> <%compilerflags64%><%endif%><%if(pch_source && pchsupport)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%if(extracppflags)%> <%extracppflags%><%endif%><%if(includes)%><%foreach(includes)%> -I"<%include%>"<%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%> +CPPFLAGS = <%if(visibility && visopt)%><%visopt%> <%endif%>$(PICFLAGS) $(GENFLAGS)<%if(compile_flags)%> <%compile_flags%><%endif%><%if(cpu)%> -DCPU=$(CPU)<%endif%><%if(tempincopt)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%if(compilerflags)%> <%compilerflags%><%endif%><%if(build64bit && compilerflags64)%> <%compilerflags64%><%endif%><%if(pch_source && pchsupport)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%if(extracppflags)%><%foreach(extracppflags)%><%if(!starts_with(extracppflag, -D) || !contains(language, java))%> <%extracppflag%><%endif%><%endfor%><%endif%><%if(includes)%><%foreach(includes)%> -I"<%include%>"<%endfor%><%endif%><%if(!contains(language, java) && macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%> OBJEXT = <%obj_ext%> OUTPUT_OPTION = <%output_option(-o \"$@\")%> COMPILE.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) <%compile_option("-c")%> @@ -103,6 +103,7 @@ SHFLAGS = <%shflags%> <%endif%> SRC =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%> LINK.cc = $(LD) $(LDFLAGS) +<%if(!contains(language, java))%> <%if(dynamicflags)%> DYNAMICFLAGS =<%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%> <%endif%> @@ -110,6 +111,7 @@ DYNAMICFLAGS =<%foreach(dynamicflags)%> -D<%dynamicflag%><%endfor%> STATICFLAGS =<%foreach(staticflags)%> -D<%staticflag%><%endfor%> <%endif%> EXPORTFLAGS = <%if(exename)%><%if(need_staticflags)%>$(STATICFLAGS)<%endif%><%else%><%if(dll_ext && sharedname)%>$(DYNAMICFLAGS)<%else%>$(STATICFLAGS)<%endif%><%endif%> +<%endif%> <%if(multiple(configurations))%> endif <%endif%> @@ -150,7 +152,7 @@ $(BIN):<%if(tempinc)%> $(TEMPINCDIR)<%endif%><%if(prelinktargetobj)%> <%targetou <%if(prelink)%> <%eval(prelink)%> <%endif%> - $(LINK.cc) $(OBJS) $(LDLIBS) $(OUTPUT_OPTION) + $(LINK.cc) $(OBJS) $(LDLIBS)<%if(exe_linkflags)%> <%eval(exe_linkflags)%><%endif%> $(OUTPUT_OPTION) <%if(postlinkbinary)%> <%postlinkbinary%> <%endif%> |