diff options
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/writestreamglue/intern/BLO_writeStreamGlue.c | 7 | ||||
| -rw-r--r-- | source/blender/writestreamglue/intern/Makefile | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/source/Makefile b/source/Makefile index ea6b9b54bd5..c3cf6e9b2d4 100644 --- a/source/Makefile +++ b/source/Makefile @@ -186,7 +186,6 @@ endif PULIB += $(OCGDIR)/blender/deflate/$(DEBUG_DIR)libdeflate.a PULIB += $(OCGDIR)/blender/encrypt/$(DEBUG_DIR)libencrypt.a PULIB += $(OCGDIR)/blender/decrypt/$(DEBUG_DIR)libdecrypt.a - PULIB += $(OCGDIR)/blender/sign/$(DEBUG_DIR)libsign.a PULIB += $(OCGDIR)/blender/verify/$(DEBUG_DIR)libverify.a PULIB += $(OCGDIR)/blender/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a diff --git a/source/blender/Makefile b/source/blender/Makefile index e62d4a95f9e..45cd1d252a2 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -34,7 +34,7 @@ include nan_definitions.mk DIRS = blenloader -DIRS += deflate inflate encrypt decrypt sign verify +DIRS += deflate inflate encrypt decrypt verify DIRS += writestreamglue readstreamglue writeblenfile readblenfile DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi DIRS += bpython makesdna src renderconverter diff --git a/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c b/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c index 4eb32efe09a..118bc6d6a7b 100644 --- a/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c +++ b/source/blender/writestreamglue/intern/BLO_writeStreamGlue.c @@ -42,7 +42,6 @@ #include "BLO_writeblenfile.h" #include "BLO_deflate.h" #include "BLO_encrypt.h" -#include "BLO_sign.h" #ifdef HAVE_CONFIG_H #include <config.h> @@ -140,11 +139,7 @@ writeStreamGlue( (*streamGlue)->streamBufferCount, streamGlueHeader); break; - case SIGN: - err = BLO_sign((*streamGlue)->streamBuffer, - (*streamGlue)->streamBufferCount, - streamGlueHeader); - break; + case SIGN: case WRITEBLENFILE: err = BLO_writeblenfile((*streamGlue)->streamBuffer, (*streamGlue)->streamBufferCount, diff --git a/source/blender/writestreamglue/intern/Makefile b/source/blender/writestreamglue/intern/Makefile index df3f88ea006..9c9a8f2e767 100644 --- a/source/blender/writestreamglue/intern/Makefile +++ b/source/blender/writestreamglue/intern/Makefile @@ -58,7 +58,6 @@ CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../deflate CPPFLAGS += -I../../encrypt -CPPFLAGS += -I../../sign CPPFLAGS += -I$(NAN_OPENSSL)/include |