Fix for the exposed problems after trying a full clean build.

Change on 2014/12/15 by nnoble <nnoble@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82192594
pull/1/merge
nnoble 10 years ago committed by Nicolas Noble
parent 2845cade4c
commit d8fd853cba
  1. 3
      vsprojects/third_party/openssl/OpenSSL.mak
  2. 4
      vsprojects/vs2013/build_openssl_x86.bat

@ -38,7 +38,7 @@ EX_LIBS=ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib
# The OpenSSL directory
SRC_D=.
GEN_INC_D=..\..\vsprojects\openssl
GEN_INC_D=..\..\vsprojects\third_party\openssl
LINK=link
LFLAGS=/nologo /subsystem:console /opt:ref /debug
@ -463,7 +463,6 @@ $(INC_D):
# This needs to be invoked once, when the makefile is first constructed, or
# after cleaning.
init: $(TMP_D) $(LIB_D) $(INC_D) $(INCO_D) $(BIN_D) $(TEST_D) headers
$(CP) "$(SRC_D)/crypto/opensslconf.h" "$(INCO_D)/opensslconf.h"
headers: $(HEADER) $(EXHEADER)

@ -3,4 +3,6 @@
@call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86
cd ..\..\third_party\openssl
nmake /F ..\..\vsprojects\third_party\openssl\OpenSSL.mak out32\ssleay32.lib out32\libeay32.lib
nmake /F ..\..\vsprojects\third_party\openssl\OpenSSL.mak init out32\ssleay32.lib out32\libeay32.lib
pause

Loading…
Cancel
Save