diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2010-01-25 18:47:53 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2010-01-25 18:47:53 +0000 |
| commit | 527ab09d076fdeb5ad01e6daae602878e328f140 (patch) | |
| tree | 28b4a2147bda36b6bbe0b5797fe5a86110fe8ff7 /templates/make.mpd | |
| parent | 4f5046078c14f48153383188cdff7e5581adbbd9 (diff) | |
| download | MPC-527ab09d076fdeb5ad01e6daae602878e328f140.tar.gz | |
ChangeLogTag: Mon Jan 25 18:46:30 UTC 2010 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'templates/make.mpd')
| -rw-r--r-- | templates/make.mpd | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/templates/make.mpd b/templates/make.mpd index cf5015b8..fa2e67da 100644 --- a/templates/make.mpd +++ b/templates/make.mpd @@ -28,6 +28,7 @@ ifeq ($(CFG), <%platform%> <%configuration%>) ifeq ($(CFG), <%configuration%>) <%endif%> <%endif%> +CC = <%cc%> CXX = <%cxx%> <%if(ld)%> LD = <%ld%> @@ -53,7 +54,8 @@ PICFLAGS = <%pic%> 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")%> +COMPILE.c = $(CC) $(CCFLAGS) $(CPPFLAGS) <%compile_option("-c")%> +COMPILE.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) <%compile_option%> <%if(rc)%> RESEXT = <%res_ext%> <%endif%> @@ -95,7 +97,7 @@ LIBSUFFIX = <%lib_modifier%> EXESUFFIX = <%lib_modifier%> <%endif%> GENFLAGS =<%if(!contains(configuration, Release) || optimize)%> <%genflags%><%endif%> -LDLIBS =<%foreach(libs)%> <%libopt%><%libname_prefix%><%lib%>$(LIBSUFFIX)<%endfor%><%foreach(lit_libs)%> <%libopt%>"<%lit_lib%>"<%endfor%><%foreach(pure_libs)%> "<%pure_lib%>"<%endfor%> <%ldlibs%> +LDLIBS =<%foreach(libs)%> <%libopt%>"<%libname_prefix%><%lib%>$(LIBSUFFIX)"<%endfor%><%foreach(lit_libs)%> <%libopt%>"<%lit_lib%>"<%endfor%><%foreach(pure_libs)%> "<%pure_lib%>"<%endfor%> <%ldlibs%> OBJS =<%if(pch_source && pchsupport)%> <%targetoutdir%><%obj_dir%><%noextension(pch_source)%>$(OBJEXT)<%endif%><%foreach(source_files)%> <%targetoutdir%><%obj_dir%><%noextension(source_file)%>$(OBJEXT)<%endfor%><%if(rc)%><%foreach(resource_files)%> <%targetoutdir%><%obj_dir%><%resource_file%>$(RESEXT)<%endfor%><%endif%> <%if(lib_ext)%> <%if(staticname)%> @@ -276,7 +278,7 @@ $(TEMPINCDIR): <%if(targetoutdir || obj_dir)%> @$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(pch_source)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(pch_source)%>" <%endif%> - $(COMPILE.cc) <%if(pchcreate)%><%pchcreate%><%targetoutdir%><%obj_dir%><%pch_header%><%pchext%> <%endif%>$(EXPORTFLAGS)<%if(!pchnobj)%> $(OUTPUT_OPTION)<%endif%> <%pch_source%> + <%if(ends_with(pch_source, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%if(pchcreate)%><%pchcreate%><%targetoutdir%><%obj_dir%><%pch_header%><%pchext%> <%endif%>$(EXPORTFLAGS)<%if(!pchnobj)%> $(OUTPUT_OPTION)<%endif%> <%pch_source%> <%if(pchnobj)%> @$(CP) <%targetoutdir%><%obj_dir%><%pch_header%><%pchext%> <%targetoutdir%><%obj_dir%><%noextension(pch_source)%>$(OBJEXT) <%endif%> @@ -287,7 +289,7 @@ $(TEMPINCDIR): <%if(targetoutdir || obj_dir)%> @$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>" <%endif%> - $(COMPILE.cc) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%><%if(pchuse && pch_source && pchsupport)%><%pchuse%><%pch_header%><%pchext%> <%if(pchstop)%><%pchstop%><%pch_header%><%endif%><%endif%>$(EXPORTFLAGS) $(OUTPUT_OPTION) <%source_file%> + <%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%><%if(pchuse && pch_source && pchsupport)%><%pchuse%><%pch_header%><%pchext%> <%if(pchstop)%><%pchstop%><%pch_header%><%endif%><%endif%>$(EXPORTFLAGS) $(OUTPUT_OPTION) <%source_file%> <%endfor%> <%if(resource_files)%> |