diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
| commit | 3fb7b207726aa7500b761c7056f7dbf82ac5015d (patch) | |
| tree | ca9641fb466f01651cbbd8d619fa6da5fac32976 /build/common.mak | |
| parent | 49aea0237b6e2134fe31c551f21e8148c884e140 (diff) | |
Merge #1050, #1052, #1053, #1054 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build/common.mak')
| -rw-r--r-- | build/common.mak | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/common.mak b/build/common.mak index d6000078..ad6df03e 100644 --- a/build/common.mak +++ b/build/common.mak @@ -17,6 +17,15 @@ include $(PJDIR)/build/cc-$(CC_NAME).mak -include cc-$(CC_NAME).mak # +# Include auto configured compiler specification. +# This will override the compiler settings above. +# Currently this is made OPTIONAL, to prevent people +# from getting errors because they don't re-run ./configure +# after downloading new PJSIP. +# +-include $(PJDIR)/build/cc-auto.mak + +# # Include global machine specific definitions # include $(PJDIR)/build/m-$(MACHINE_NAME).mak |