diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:39:56 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:39:56 +0200 |
| commit | 0aba56e2db8d939539688e0489cbee9176f0848b (patch) | |
| tree | 440e7a68e1c151761c5a7b45697946151006649e | |
| parent | 71de5f622a7917f78823a7e7840194e1b0f8f070 (diff) | |
| parent | 03acf85c36f2de235d6bf8a07b8a253c30679570 (diff) | |
CTS-320 (part 3 of 3) use system zlib for standalone
| -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 c8125c675f..f3f6c0ff15 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -149,6 +149,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + CTS-320 SNOW-278 VWR-233 WEB-262 diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index fdeb93e27f..3054bb8d09 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -39,7 +39,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 82765c740f..f65f39e755 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -39,7 +39,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 + #if LL_MESH_ENABLED |