Part of a fix to the makefiles for compiling the new ZLib stuff. This
authorChris Burt <desoto@exenex.com>
Thu, 28 Jul 2005 00:13:18 +0000 (00:13 +0000)
committerChris Burt <desoto@exenex.com>
Thu, 28 Jul 2005 00:13:18 +0000 (00:13 +0000)
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.

source/blender/blenkernel/intern/Makefile
source/blender/blenlib/intern/Makefile

index f2bd77f2045fd3ac5da2af6d2979aafd21dad9da..250ddae1fd98a8417ee264ed3c4f55713f19f913 100644 (file)
@@ -70,6 +70,9 @@ CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I$(NAN_IKSOLVER)/include
 CPPFLAGS += -I$(NAN_DECIMATION)/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..
 
 # path to our own external headerfiles
 CPPFLAGS += -I..
 
index 18be55db7b61a98d9da74de300fad07ae3cf0cc2..b6e827518bd53caa098afe76e3a53ab722830312 100644 (file)
@@ -54,6 +54,8 @@ CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
 # path to blenkernel
 CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
 CPPFLAGS += -I../../include/
 # 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
 
 ifeq ($(WITH_FREETYPE2), true)
        CPPFLAGS += -DWITH_FREETYPE2