Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorChris Burt <desoto@exenex.com>2005-09-18 21:06:21 +0400
committerChris Burt <desoto@exenex.com>2005-09-18 21:06:21 +0400
commit47d5cc275767045a84e5d92d26a19e3de4236f8c (patch)
treef0837b0973a71427b110b282d624d513271c0877 /intern
parent493c9410163cef4b519917ee4cd3cd3f83ed6cf0 (diff)
Added zlib include for solaris and windows to fix broken compilation of
new fluids sim. Thanks lukep and theeth!
Diffstat (limited to 'intern')
-rw-r--r--intern/elbeem/intern/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/elbeem/intern/Makefile b/intern/elbeem/intern/Makefile
index fb11f1dfb9e..49f0b936e6b 100644
--- a/intern/elbeem/intern/Makefile
+++ b/intern/elbeem/intern/Makefile
@@ -46,3 +46,8 @@ CPPFLAGS += -I../extern
CPPFLAGS += $(NAN_SDLCFLAGS)
CPPFLAGS += -I$(NAN_PNG)/include
CPPFLAGS += -I$(NAN_PNG)/include/libpng
+
+# zlib
+ifeq ($(OS),$(findstring $(OS), "solaris windows"))
+ CPPFLAGS += -I$(NAN_ZLIB)/include
+endif