diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 18:42:34 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 18:42:34 -0500 |
| commit | be1fd73390cab288c75ef99e704f3aa195a0c4ac (patch) | |
| tree | fe30b2a5d2c73b0167e61d2037c268a50d361e6e | |
| parent | 65a66458c2e5ab369f22c5a52b93db6ef7305609 (diff) | |
| parent | 0aba56e2db8d939539688e0489cbee9176f0848b (diff) | |
CTS-320 SH-465 FIX use system zlib for standalone builds
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 7 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5d9a971b1e..148abe49ed 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -170,6 +170,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + CTS-320 SNOW-278 SNOW-503 SNOW-510 diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 67cc707a01..f3cbfab77a 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -33,7 +33,12 @@ #include <iostream> #include "apr_base64.h" -#include "zlib/zlib.h" // for davep's dirty little zip functions + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" // for davep's dirty little zip functions +#endif #if !LL_WINDOWS #include <netinet/in.h> // htonl & ntohl diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index eacf2377fe..b486e17194 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -34,7 +34,13 @@ #include "dae/daeErrorHandler.h" #include "dom/domConstants.h" #include "dom/domMesh.h" -#include "zlib/zlib.h" + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" +#endif + std::string model_names[] = |