flyskype
/
openresty
mirror of https://github.com/openresty/openresty
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update: the trailing \ is aligned up vertically.

Browse Source
pull/329/head
geniuss99 8 years ago
parent d8b346e27c
commit e892c61bc1
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

56
patches/nginx-1.13.7-lua_nginx_msvc_support.patch
Unescape Escape View File

@ -67,7 +67,7 @@ diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/make nginx-1.13.7.1-
END END
diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x64.msvc nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x64.msvc diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x64.msvc nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x64.msvc
--- nginx-1.13.7.1-original/auto/lib/openssl/makefile-x64.msvc 1970-01-01 04:00:00 +0400 --- nginx-1.13.7.1-original/auto/lib/openssl/makefile-x64.msvc 1970-01-01 04:00:00 +0400
+++ nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x64.msvc 2018-01-01 16:36:59 +0400 +++ nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x64.msvc 2018-01-10 16:50:39 +0400
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+ +
+# Copyright (C) Igor Sysoev +# Copyright (C) Igor Sysoev
@ -75,24 +75,24 @@ diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x64.msvc ng
+ +
+ +
+all: +all:
+ cd $(OPENSSL) + cd $(OPENSSL)
+ +
+ perl Configure VC-WIN64A no-shared \ + perl Configure VC-WIN64A no-shared \
+ --prefix="%cd%/openssl" \ + --prefix="%cd%/openssl" \
+ --openssldir="%cd%/openssl/ssl" \ + --openssldir="%cd%/openssl/ssl" \
+ $(OPENSSL_OPT) + $(OPENSSL_OPT)
+ +
+ if exist ms\do_win64a.bat ( \ + if exist ms\do_win64a.bat ( \
+ ms\do_win64a \ + ms\do_win64a \
+ && $(MAKE) -f ms\nt.mak \ + && $(MAKE) -f ms\nt.mak \
+ && $(MAKE) -f ms\nt.mak install \ + && $(MAKE) -f ms\nt.mak install \
+ ) else ( \ + ) else ( \
+ $(MAKE) \ + $(MAKE) \
+ && $(MAKE) install_sw \ + && $(MAKE) install_sw \
+ ) + )
diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x86.msvc nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x86.msvc diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x86.msvc nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x86.msvc
--- nginx-1.13.7.1-original/auto/lib/openssl/makefile-x86.msvc 1970-01-01 04:00:00 +0400 --- nginx-1.13.7.1-original/auto/lib/openssl/makefile-x86.msvc 1970-01-01 04:00:00 +0400
+++ nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x86.msvc 2017-12-17 00:23:23 +0400 +++ nginx-1.13.7.1-msvc/auto/lib/openssl/makefile-x86.msvc 2018-01-10 16:49:41 +0400
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+ +
+# Copyright (C) Igor Sysoev +# Copyright (C) Igor Sysoev
@ -100,18 +100,18 @@ diff --binary -Nur nginx-1.13.7.1-original/auto/lib/openssl/makefile-x86.msvc ng
+ +
+ +
+all: +all:
+ cd $(OPENSSL) + cd $(OPENSSL)
+ +
+ perl Configure VC-WIN32 no-shared \ + perl Configure VC-WIN32 no-shared \
+ --prefix="%cd%/openssl" \ + --prefix="%cd%/openssl" \
+ --openssldir="%cd%/openssl/ssl" \ + --openssldir="%cd%/openssl/ssl" \
+ $(OPENSSL_OPT) + $(OPENSSL_OPT)
+ +
+ if exist ms\do_nasm.bat ( \ + if exist ms\do_nasm.bat ( \
+ ms\do_nasm \ + ms\do_nasm \
+ && $(MAKE) -f ms\nt.mak \ + && $(MAKE) -f ms\nt.mak \
+ && $(MAKE) -f ms\nt.mak install \ + && $(MAKE) -f ms\nt.mak install \
+ ) else ( \ + ) else ( \
+ $(MAKE) \ + $(MAKE) \
+ && $(MAKE) install_sw \ + && $(MAKE) install_sw \
+ ) + )

Write Preview
Loading…
Cancel
Save