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/source
diff options
context:
space:
mode:
authorChris Burt <desoto@exenex.com>2005-07-28 04:13:18 +0400
committerChris Burt <desoto@exenex.com>2005-07-28 04:13:18 +0400
commit539a9ad08fe6735bafe9cd77fe6c316a78b7b762 (patch)
tree8fe5d40b8f6f6dfd71d5d78f0936af047ef8ee30 /source
parent8828aa060aca642161652783cf0ddf21de6bc69b (diff)
Part of a fix to the makefiles for compiling the new ZLib stuff. This
seemed to do the trick for me, however a game engine error has prevented me from compiling to test. Anyone who has time to test compiling it would be appreciated.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/Makefile3
-rw-r--r--source/blender/blenlib/intern/Makefile2
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index f2bd77f2045..250ddae1fd9 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -70,6 +70,9 @@ CPPFLAGS += -I../../render/extern/include
CPPFLAGS += -I$(NAN_IKSOLVER)/include
CPPFLAGS += -I$(NAN_DECIMATION)/include
+# path to zlib
+CPPFLAGS += -I$(NAN_ZLIB)/include
+
# path to our own external headerfiles
CPPFLAGS += -I..
diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile
index 18be55db7b6..b6e827518bd 100644
--- a/source/blender/blenlib/intern/Makefile
+++ b/source/blender/blenlib/intern/Makefile
@@ -54,6 +54,8 @@ CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
# path to blenkernel
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
CPPFLAGS += -I../../include/
+# path to zlib
+CPPFLAGS += -I$(NAN_ZLIB)/include
ifeq ($(WITH_FREETYPE2), true)
CPPFLAGS += -DWITH_FREETYPE2