Compile proj library as a static lib.

Compiling the proj library as a static lib and then linking as necessary
improves compile speed as we now only build it once. The proj library is
also built with CONFIG+=warn_off which removes a lot of compile warnings
from the build output.

Change-Id: I1842263d5bd96f8c89d91b25583ce58c79e2b1ff
Reviewed-on: http://codereview.qt.nokia.com/1800
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>

2 files changed, 161 insertions, 149 deletions

diff --git a/src/3rdparty/proj.pri b/src/3rdparty/proj.pri
index e075a68e..553e4758 100644
--- a/src/3rdparty/proj.pri
+++ b/src/3rdparty/proj.pri
@@ -1,158 +1,11 @@
 INCLUDEPATH += $$PWD/proj/include
 
-SOURCES += $$PWD/proj/PJ_aeqd.c \
-        $$PWD/proj/PJ_gnom.c \
-        $$PWD/proj/PJ_laea.c \
-        $$PWD/proj/PJ_mod_ster.c \
-        $$PWD/proj/PJ_nsper.c \
-        $$PWD/proj/PJ_nzmg.c \
-        $$PWD/proj/PJ_ortho.c \
-        $$PWD/proj/PJ_stere.c \
-        $$PWD/proj/PJ_sterea.c \
-        $$PWD/proj/PJ_aea.c \
-        $$PWD/proj/PJ_bipc.c \
-        $$PWD/proj/PJ_bonne.c \
-        $$PWD/proj/PJ_eqdc.c \
-        $$PWD/proj/PJ_imw_p.c \
-        $$PWD/proj/PJ_krovak.c \
-        $$PWD/proj/PJ_lcc.c \
-        $$PWD/proj/PJ_poly.c \
-        $$PWD/proj/PJ_rpoly.c \
-        $$PWD/proj/PJ_sconics.c \
-        $$PWD/proj/proj_rouss.c \
-        $$PWD/proj/PJ_cass.c \
-        $$PWD/proj/PJ_cc.c \
-        $$PWD/proj/PJ_cea.c \
-        $$PWD/proj/PJ_eqc.c \
-        $$PWD/proj/PJ_gall.c \
-        $$PWD/proj/PJ_labrd.c \
-        $$PWD/proj/PJ_lsat.c \
-        $$PWD/proj/PJ_merc.c \
-        $$PWD/proj/PJ_mill.c \
-        $$PWD/proj/PJ_ocea.c \
-        $$PWD/proj/PJ_omerc.c \
-        $$PWD/proj/PJ_somerc.c \
-        $$PWD/proj/PJ_tcc.c \
-        $$PWD/proj/PJ_tcea.c \
-        $$PWD/proj/PJ_tmerc.c \
-        $$PWD/proj/PJ_airy.c \
-        $$PWD/proj/PJ_aitoff.c \
-        $$PWD/proj/PJ_august.c \
-        $$PWD/proj/PJ_bacon.c \
-        $$PWD/proj/PJ_chamb.c \
-        $$PWD/proj/PJ_hammer.c \
-        $$PWD/proj/PJ_lagrng.c \
-        $$PWD/proj/PJ_larr.c \
-        $$PWD/proj/PJ_lask.c \
-        $$PWD/proj/PJ_nocol.c \
-        $$PWD/proj/PJ_ob_tran.c \
-        $$PWD/proj/PJ_oea.c \
-        $$PWD/proj/PJ_tpeqd.c \
-        $$PWD/proj/PJ_vandg.c \
-        $$PWD/proj/PJ_vandg2.c \
-        $$PWD/proj/PJ_vandg4.c \
-        $$PWD/proj/PJ_wag7.c \
-        $$PWD/proj/PJ_lcca.c \
-        $$PWD/proj/PJ_geos.c \
-        $$PWD/proj/PJ_boggs.c \
-        $$PWD/proj/PJ_collg.c \
-        $$PWD/proj/PJ_crast.c \
-        $$PWD/proj/PJ_denoy.c \
-        $$PWD/proj/PJ_eck1.c \
-        $$PWD/proj/PJ_eck2.c \
-        $$PWD/proj/PJ_eck3.c \
-        $$PWD/proj/PJ_eck4.c \
-        $$PWD/proj/PJ_eck5.c \
-        $$PWD/proj/PJ_fahey.c \
-        $$PWD/proj/PJ_fouc_s.c \
-        $$PWD/proj/PJ_gins8.c \
-        $$PWD/proj/PJ_gstmerc.c \
-        $$PWD/proj/PJ_gn_sinu.c \
-        $$PWD/proj/PJ_goode.c \
-        $$PWD/proj/PJ_hatano.c \
-        $$PWD/proj/PJ_loxim.c \
-        $$PWD/proj/PJ_mbt_fps.c \
-        $$PWD/proj/PJ_mbtfpp.c \
-        $$PWD/proj/PJ_mbtfpq.c \
-        $$PWD/proj/PJ_moll.c \
-        $$PWD/proj/PJ_nell.c \
-        $$PWD/proj/PJ_nell_h.c \
-        $$PWD/proj/PJ_putp2.c \
-        $$PWD/proj/PJ_putp3.c \
-        $$PWD/proj/PJ_putp4p.c \
-        $$PWD/proj/PJ_putp5.c \
-        $$PWD/proj/PJ_putp6.c \
-        $$PWD/proj/PJ_robin.c \
-        $$PWD/proj/PJ_sts.c \
-        $$PWD/proj/PJ_urm5.c \
-        $$PWD/proj/PJ_urmfps.c \
-        $$PWD/proj/PJ_wag2.c \
-        $$PWD/proj/PJ_wag3.c \
-        $$PWD/proj/PJ_wink1.c \
-        $$PWD/proj/PJ_wink2.c \
-        $$PWD/proj/pj_latlong.c \
-        $$PWD/proj/pj_geocent.c \
-        $$PWD/proj/aasincos.c \
-        $$PWD/proj/adjlon.c \
-        $$PWD/proj/bch2bps.c \
-        $$PWD/proj/bchgen.c \
-        $$PWD/proj/biveval.c \
-        $$PWD/proj/dmstor.c \
-        $$PWD/proj/mk_cheby.c \
-        $$PWD/proj/pj_auth.c \
-        $$PWD/proj/pj_deriv.c \
-        $$PWD/proj/pj_ell_set.c \
-        $$PWD/proj/pj_ellps.c \
-        $$PWD/proj/pj_errno.c \
-        $$PWD/proj/pj_factors.c \
-        $$PWD/proj/pj_fwd.c \
-        $$PWD/proj/pj_init.c \
-        $$PWD/proj/pj_inv.c \
-        $$PWD/proj/pj_list.c \
-        $$PWD/proj/pj_malloc.c \
-        $$PWD/proj/pj_mlfn.c \
-        $$PWD/proj/pj_msfn.c \
-        $$PWD/proj/proj_mdist.c \
-        $$PWD/proj/pj_open_lib_qt.cpp \
-	$$PWD/proj/pj_param.c \
-        $$PWD/proj/pj_phi2.c \
-        $$PWD/proj/pj_pr_list.c \
-        $$PWD/proj/pj_qsfn.c \
-        $$PWD/proj/pj_strerrno.c \
-        $$PWD/proj/pj_tsfn.c \
-        $$PWD/proj/pj_units.c \
-        $$PWD/proj/pj_zpoly1.c \
-        $$PWD/proj/rtodms.c \
-        $$PWD/proj/vector1.c \
-        $$PWD/proj/pj_release.c \
-        $$PWD/proj/pj_gauss.c \
-        $$PWD/proj/nad_cvt.c \
-        $$PWD/proj/nad_init.c \
-        $$PWD/proj/nad_intr.c \
-        $$PWD/proj/emess.c \
-        $$PWD/proj/pj_apply_gridshift.c \
-        $$PWD/proj/pj_datums.c \
-        $$PWD/proj/pj_datum_set.c \
-        $$PWD/proj/pj_transform.c \
-        $$PWD/proj/geocent.c \
-        $$PWD/proj/pj_utils.c \
-        $$PWD/proj/pj_gridinfo.c \
-        $$PWD/proj/pj_gridlist.c \
-        $$PWD/proj/pj_mutex.c \
-        $$PWD/proj/pj_initcache.c
-
 DEFINES += DISABLE_CVSID
 
-unix {
-  DEFINES += MUTEX_pthread
-}
-
 symbian {
   LIBS += -llibpthread -llibm
 }
 
-win32 {
-  DEFINES += MUTEX_win32
+!contains(BUILD_PROJ, true) {
+    LIBS += -L$$QT_BUILD_TREE/../qtlocation/src/3rdparty -lproj
 }
-
-RESOURCES += $$PWD/proj/data.qrc
diff --git a/src/3rdparty/proj.pro b/src/3rdparty/proj.pro
new file mode 100644
index 00000000..bd2ad315
--- /dev/null
+++ b/src/3rdparty/proj.pro
@@ -0,0 +1,159 @@
+TEMPLATE=lib
+CONFIG+=static
+
+BUILD_PROJ=true
+include(proj.pri)
+
+CONFIG += warn_off
+
+SOURCES += \
+        $$PWD/proj/PJ_aeqd.c \
+        $$PWD/proj/PJ_gnom.c \
+        $$PWD/proj/PJ_laea.c \
+        $$PWD/proj/PJ_mod_ster.c \
+        $$PWD/proj/PJ_nsper.c \
+        $$PWD/proj/PJ_nzmg.c \
+        $$PWD/proj/PJ_ortho.c \
+        $$PWD/proj/PJ_stere.c \
+        $$PWD/proj/PJ_sterea.c \
+        $$PWD/proj/PJ_aea.c \
+        $$PWD/proj/PJ_bipc.c \
+        $$PWD/proj/PJ_bonne.c \
+        $$PWD/proj/PJ_eqdc.c \
+        $$PWD/proj/PJ_imw_p.c \
+        $$PWD/proj/PJ_krovak.c \
+        $$PWD/proj/PJ_lcc.c \
+        $$PWD/proj/PJ_poly.c \
+        $$PWD/proj/PJ_rpoly.c \
+        $$PWD/proj/PJ_sconics.c \
+        $$PWD/proj/proj_rouss.c \
+        $$PWD/proj/PJ_cass.c \
+        $$PWD/proj/PJ_cc.c \
+        $$PWD/proj/PJ_cea.c \
+        $$PWD/proj/PJ_eqc.c \
+        $$PWD/proj/PJ_gall.c \
+        $$PWD/proj/PJ_labrd.c \
+        $$PWD/proj/PJ_lsat.c \
+        $$PWD/proj/PJ_merc.c \
+        $$PWD/proj/PJ_mill.c \
+        $$PWD/proj/PJ_ocea.c \
+        $$PWD/proj/PJ_omerc.c \
+        $$PWD/proj/PJ_somerc.c \
+        $$PWD/proj/PJ_tcc.c \
+        $$PWD/proj/PJ_tcea.c \
+        $$PWD/proj/PJ_tmerc.c \
+        $$PWD/proj/PJ_airy.c \
+        $$PWD/proj/PJ_aitoff.c \
+        $$PWD/proj/PJ_august.c \
+        $$PWD/proj/PJ_bacon.c \
+        $$PWD/proj/PJ_chamb.c \
+        $$PWD/proj/PJ_hammer.c \
+        $$PWD/proj/PJ_lagrng.c \
+        $$PWD/proj/PJ_larr.c \
+        $$PWD/proj/PJ_lask.c \
+        $$PWD/proj/PJ_nocol.c \
+        $$PWD/proj/PJ_ob_tran.c \
+        $$PWD/proj/PJ_oea.c \
+        $$PWD/proj/PJ_tpeqd.c \
+        $$PWD/proj/PJ_vandg.c \
+        $$PWD/proj/PJ_vandg2.c \
+        $$PWD/proj/PJ_vandg4.c \
+        $$PWD/proj/PJ_wag7.c \
+        $$PWD/proj/PJ_lcca.c \
+        $$PWD/proj/PJ_geos.c \
+        $$PWD/proj/PJ_boggs.c \
+        $$PWD/proj/PJ_collg.c \
+        $$PWD/proj/PJ_crast.c \
+        $$PWD/proj/PJ_denoy.c \
+        $$PWD/proj/PJ_eck1.c \
+        $$PWD/proj/PJ_eck2.c \
+        $$PWD/proj/PJ_eck3.c \
+        $$PWD/proj/PJ_eck4.c \
+        $$PWD/proj/PJ_eck5.c \
+        $$PWD/proj/PJ_fahey.c \
+        $$PWD/proj/PJ_fouc_s.c \
+        $$PWD/proj/PJ_gins8.c \
+        $$PWD/proj/PJ_gstmerc.c \
+        $$PWD/proj/PJ_gn_sinu.c \
+        $$PWD/proj/PJ_goode.c \
+        $$PWD/proj/PJ_hatano.c \
+        $$PWD/proj/PJ_loxim.c \
+        $$PWD/proj/PJ_mbt_fps.c \
+        $$PWD/proj/PJ_mbtfpp.c \
+        $$PWD/proj/PJ_mbtfpq.c \
+        $$PWD/proj/PJ_moll.c \
+        $$PWD/proj/PJ_nell.c \
+        $$PWD/proj/PJ_nell_h.c \
+        $$PWD/proj/PJ_putp2.c \
+        $$PWD/proj/PJ_putp3.c \
+        $$PWD/proj/PJ_putp4p.c \
+        $$PWD/proj/PJ_putp5.c \
+        $$PWD/proj/PJ_putp6.c \
+        $$PWD/proj/PJ_robin.c \
+        $$PWD/proj/PJ_sts.c \
+        $$PWD/proj/PJ_urm5.c \
+        $$PWD/proj/PJ_urmfps.c \
+        $$PWD/proj/PJ_wag2.c \
+        $$PWD/proj/PJ_wag3.c \
+        $$PWD/proj/PJ_wink1.c \
+        $$PWD/proj/PJ_wink2.c \
+        $$PWD/proj/pj_latlong.c \
+        $$PWD/proj/pj_geocent.c \
+        $$PWD/proj/aasincos.c \
+        $$PWD/proj/adjlon.c \
+        $$PWD/proj/bch2bps.c \
+        $$PWD/proj/bchgen.c \
+        $$PWD/proj/biveval.c \
+        $$PWD/proj/dmstor.c \
+        $$PWD/proj/mk_cheby.c \
+        $$PWD/proj/pj_auth.c \
+        $$PWD/proj/pj_deriv.c \
+        $$PWD/proj/pj_ell_set.c \
+        $$PWD/proj/pj_ellps.c \
+        $$PWD/proj/pj_errno.c \
+        $$PWD/proj/pj_factors.c \
+        $$PWD/proj/pj_fwd.c \
+        $$PWD/proj/pj_init.c \
+        $$PWD/proj/pj_inv.c \
+        $$PWD/proj/pj_list.c \
+        $$PWD/proj/pj_malloc.c \
+        $$PWD/proj/pj_mlfn.c \
+        $$PWD/proj/pj_msfn.c \
+        $$PWD/proj/proj_mdist.c \
+        $$PWD/proj/pj_open_lib_qt.cpp \
+        $$PWD/proj/pj_param.c \
+        $$PWD/proj/pj_phi2.c \
+        $$PWD/proj/pj_pr_list.c \
+        $$PWD/proj/pj_qsfn.c \
+        $$PWD/proj/pj_strerrno.c \
+        $$PWD/proj/pj_tsfn.c \
+        $$PWD/proj/pj_units.c \
+        $$PWD/proj/pj_zpoly1.c \
+        $$PWD/proj/rtodms.c \
+        $$PWD/proj/vector1.c \
+        $$PWD/proj/pj_release.c \
+        $$PWD/proj/pj_gauss.c \
+        $$PWD/proj/nad_cvt.c \
+        $$PWD/proj/nad_init.c \
+        $$PWD/proj/nad_intr.c \
+        $$PWD/proj/emess.c \
+        $$PWD/proj/pj_apply_gridshift.c \
+        $$PWD/proj/pj_datums.c \
+        $$PWD/proj/pj_datum_set.c \
+        $$PWD/proj/pj_transform.c \
+        $$PWD/proj/geocent.c \
+        $$PWD/proj/pj_utils.c \
+        $$PWD/proj/pj_gridinfo.c \
+        $$PWD/proj/pj_gridlist.c \
+        $$PWD/proj/pj_mutex.c \
+        $$PWD/proj/pj_initcache.c
+
+unix {
+  DEFINES += MUTEX_pthread
+}
+
+win32 {
+  DEFINES += MUTEX_win32
+}
+
+RESOURCES += $$PWD/proj/data.qrc