summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-25 11:36:07 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-25 11:36:07 +0200
commite3d61c92368189c34a406070c97a62ef0958a9f9 (patch)
treec61acbe68bf300b29e868a6c573b9b3ac3e3f5ab /indra
parent3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff)
CTS-320 (part 1 of 3) use system zlib for standalone
Diffstat (limited to 'indra')
-rw-r--r--indra/llmath/llvolume.cpp7
1 files changed, 6 insertions, 1 deletions
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