- switched tu zlib develop because the zconf.h is not longer renamed

- moved appveyor.yml
Tomenz · Nov 18, 2024 · 15e7b93 · 15e7b93
1 parent e45f1d1
commit 15e7b93
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "zlib"]
 	path = zlib
 	url = https://github.com/madler/zlib.git
-	branch = master
+	branch = remotes/origin/develop
 [submodule "FastCgi"]
 	path = FastCgi
 	url = https://github.com/Tomenz/FastCgi

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,8 @@ set(BROTLI_BUNDLED_MODE ON)
 set(BROTLI_DISABLE_TESTS TRUE)
 set(BUILD_SHARED_LIBS OFF)
 mark_as_advanced(BUILD_SHARED_LIBS)
-
+option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF)
+option(RENAME_ZCONF "Rename the zconf when building out of source" OFF)
 
 set(SKIP_INSTALL_ALL TRUE)
 

diff --git a/.github/workflows/appveyor.yml → appveyor.yml b/.github/workflows/appveyor.yml → appveyor.yml
@@ -11,5 +11,5 @@ install:
 # - cmd: dir C:\OpenSSL-v33-Win64\lib\VC\x64\MT\
 - cmd: copy /Y C:\OpenSSL-v33-Win64\lib\VC\x64\MT\*.* C:\OpenSSL-v33-Win64\
 build:
-  project: Http2Serv.vcxproj
+  project: SockTest.sln
   verbosity: minimal
diff --git a/zlib b/zlib
+208 −0		.github/workflows/c-std.yml
+13 −4		.github/workflows/cmake.yml
+4 −4		.github/workflows/configure.yml
+1 −1		.github/workflows/fuzz.yml
+1 −0		.gitignore
+9 −4		CMakeLists.txt
+3 −0		ChangeLog
+1 −1		FAQ
+1 −1		LICENSE
+7 −5		Makefile.in
+2 −4		README
+9 −7		configure
+1 −1		contrib/ada/readme.txt
+1 −1		contrib/delphi/ZLib.pas
+1 −1		contrib/dotzlib/DotZLib/UnitTests.cs
+574 −574		contrib/gcc_gvmat64/gvmat64.S
+12 −12		contrib/infback9/infback9.c
+2 −2		contrib/infback9/inftree9.c
+12 −4		contrib/minizip/Makefile
+2 −2		contrib/minizip/configure.ac
+57 −0		contrib/minizip/ints.h
+4 −31		contrib/minizip/ioapi.h
+12 −4		contrib/minizip/iowin32.c
+1 −1		contrib/minizip/make_vms.com
+8 −8		contrib/minizip/miniunz.c
+10 −7		contrib/minizip/minizip.c
+1 −1		contrib/minizip/minizip.pc.in
+32 −29		contrib/minizip/mztools.c
+361 −0		contrib/minizip/skipset.h
+2 −6		contrib/minizip/unzip.c
+4 −0		contrib/minizip/unzip.h
+247 −4		contrib/minizip/zip.c
+15 −9		contrib/minizip/zip.h
+1 −1		contrib/nuget/nuget.csproj
+1 −1		contrib/pascal/zlibpas.pas
+4 −0		contrib/puff/pufftest.c
+1 −1		contrib/vstudio/readme.txt
+3 −3		contrib/vstudio/vc10/zlib.rc
+7 −4		contrib/vstudio/vc10/zlibvc.def
+3 −3		contrib/vstudio/vc11/zlib.rc
+7 −4		contrib/vstudio/vc11/zlibvc.def
+3 −3		contrib/vstudio/vc12/zlib.rc
+7 −4		contrib/vstudio/vc12/zlibvc.def
+3 −3		contrib/vstudio/vc14/zlib.rc
+7 −4		contrib/vstudio/vc14/zlibvc.def
+3 −3		contrib/vstudio/vc17/zlib.rc
+161 −158		contrib/vstudio/vc17/zlibvc.def
+3 −3		contrib/vstudio/vc9/zlib.rc
+7 −4		contrib/vstudio/vc9/zlibvc.def
+24 −11		deflate.c
+3 −0		deflate.h
+12 −12		examples/enough.c
+9 −9		examples/gun.c
+4 −0		examples/gznorm.c
+4 −0		examples/zpipe.c
+114 −97		examples/zran.c
+6 −4		examples/zran.h
+30 −29		gzguts.h
+16 −13		gzlib.c
+2 −1		gzread.c
+12 −12		infback.c
+4 −4		inffast.c
+22 −22		inflate.c
+1 −1		inflate.h
+2 −2		inftrees.c
+1 −1		msdos/Makefile.dj2
+1 −1		old/Makefile.riscos
+1 −1		os400/README400
+6 −0		os400/bndsrc
+7 −3		os400/zlib.inc
+6 −6		qnx/package.qpg
+7 −1		test/example.c
+5 −5		test/infcover.c
+44 −33		test/minigzip.c
+2 −2		treebuild.xml
+3 −1		trees.c
+1 −1		win32/DLL_FAQ.txt
+2 −2		win32/README-WIN32.txt
+1 −0		win32/zlib.def
+17 −16		zconf.h
+17 −16		zconf.h.cmakein
+17 −16		zconf.h.in
+3 −3		zlib.3
+34 −19		zlib.h
+4 −0		zlib.map
+10 −7		zutil.h