diff options
author | Kent Mein <mein@cs.umn.edu> | 2003-05-30 19:06:54 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2003-05-30 19:06:54 +0400 |
commit | 3c7c20676e1666f2d684571b501d7ac8762a91e0 (patch) | |
tree | 3928428752f6b1c30ed3ceceae7f5e550d764300 /source/Makefile | |
parent | 42d04bec4d434b959dc118a9f42f0d9c32547bf9 (diff) |
This is a fun one ;)
Removes ssl from blender.
makes the following directorys not needed anymore:
blender/intern/keymaker
blender/source/blender/src/pub
blender/source/blender/encrypt
blender/source/blender/decrypt
blender/source/blender/sign
blender/source/blender/verify
It works with The Nan Makefiles and autoconf, could whoever is working
on the other build systems update them so we can nuke those directorys?
They won't do anything but I figured I'd leave them in for a week or so
to make things easyer on people.
Kent
Diffstat (limited to 'source/Makefile')
-rw-r--r-- | source/Makefile | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source/Makefile b/source/Makefile index 696bcf3a2b1..135f0061b92 100644 --- a/source/Makefile +++ b/source/Makefile @@ -191,8 +191,6 @@ endif #PULIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a PULIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a 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/writeblenfile/$(DEBUG_DIR)libwriteblenfile.a PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a # toggle 2 writestreamglue libs for the Uber-Publisher :) @@ -212,25 +210,9 @@ endif # but somehow it consistently fails to resolve these symbols... or # can I just not check them? nm claims they aren't... SPLIB += $(OCGDIR)/blender/inflate/$(DEBUG_DIR)libinflate.a - SPLIB += $(OCGDIR)/blender/decrypt/$(DEBUG_DIR)libdecrypt.a SPLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a - PULIB += $(NAN_BLENKEY)/lib/libblenkey.a - SPLIB += $(NAN_BLENKEY)/lib/libblenkey.a - ifeq ($(OS),windows) - ifeq ($(FREE_WINDOWS),true) - PULIB += $(NAN_OPENSSL)/lib/libcrypto.a - SPLIB += $(NAN_OPENSSL)/lib/libcrypto.a - else - PULIB += $(NAN_OPENSSL)/lib/libeay32.lib - SPLIB += $(NAN_OPENSSL)/lib/libeay32.lib - endif - else - PULIB += $(NAN_OPENSSL)/lib/libcrypto.a - SPLIB += $(NAN_OPENSSL)/lib/libcrypto.a - endif - # These three need to be explicitly mentioned on the cl, because # if they are offered as a lib, they are optimized away. (nzc) NSPLUGLIB = $(OCGDIR)/gameengine/GamePlayer/netscape/src/$(DEBUG_DIR)UnixShell.o @@ -273,11 +255,6 @@ endif # A bit silly... but needed to resolve symbols. PLUGREMLIB = $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -ifeq ($(OS),windows) - PLUGREMLIB += $(NAN_OPENSSL)/lib/libeay32.lib -else - PLUGREMLIB += $(NAN_OPENSSL)/lib/libcrypto.a -endif ######################## OS dependencies (alphabetic!) ################ |