diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:36:07 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-25 11:36:07 +0200 |
| commit | e3d61c92368189c34a406070c97a62ef0958a9f9 (patch) | |
| tree | c61acbe68bf300b29e868a6c573b9b3ac3e3f5ab | |
| parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
CTS-320 (part 1 of 3) use system zlib for standalone
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 942ba0f0b9..9ce07a3459 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -139,6 +139,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + CTS-320 VWR-233 WEB-262 Bulli Schumann diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index afa82ed399..3c1dd11842 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -47,7 +47,12 @@ #include "llvolume.h" #include "llstl.h" #include "llsdserialize.h" -#include "zlib/zlib.h" + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" +#endif #define DEBUG_SILHOUETTE_BINORMALS 0 |