We need to split up zlib headers in libretro-common to its own separate

dir
2025-01-30 03:32:46 +00:00 · 2019-05-27 03:40:14 +02:00 · 2019-05-27 03:40:14 +02:00 · 22d762be67
commit 22d762be67
parent 0f07206357
28 changed files with 27 additions and 24 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -1594,7 +1594,7 @@ ifeq ($(HAVE_ZLIB), 1)
             $(DEPS_DIR)/libz/trees.o \
             $(DEPS_DIR)/libz/uncompr.o \
             $(DEPS_DIR)/libz/zutil.o
-      INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat
+      INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat/zlib
      DEFINES += -DWANT_ZLIB
   else
      LIBS += $(ZLIB_LIBS)
--- a/Makefile.ctr
+++ b/Makefile.ctr
@ -136,7 +136,8 @@ CFLAGS += -I. \
 			 -Ideps/libz \
 			 -Ideps/7zip \
 			 -Ideps/stb \
-			 -Ilibretro-common/include
+			 -Ilibretro-common/include \
+			 -Ilibretro-common/include/compat/zlib

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@ -80,7 +80,7 @@ else
   CFLAGS += -O2
 endif

-CFLAGS += -DHAVE_RPNG -Wall -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
+CFLAGS += -DHAVE_RPNG -Wall -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -std=gnu99 -s USE_ZLIB=1 \
          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
--- a/Makefile.griffin
+++ b/Makefile.griffin
@ -838,6 +838,7 @@ endif

 ifeq ($(HAVE_ZLIB), 1)
   CFLAGS      += -DHAVE_ZLIB
+   INCLUDE     += -I./libretro-common/include/compat/zlib
 endif

 ifeq ($(WANT_ZLIB), 1)
--- a/Makefile.libnx
+++ b/Makefile.libnx
@ -112,7 +112,7 @@ APP_ICON := pkg/libnx/retroarch.jpg
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd

 CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
-          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
+          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)

 CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_STB_FONT #-DHAVE_FREETYPE

--- a/Makefile.orbis
+++ b/Makefile.orbis
@ -83,7 +83,7 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb -Ilibretro-common/include/compat/zlib
 LIBDIRS := -L.

 ARCHFLAGS := -m64 -DORBIS
--- a/Makefile.ps2
+++ b/Makefile.ps2
@ -31,7 +31,7 @@ ifeq ($(MUTE_WARNINGS), 1)
 endif

 INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -I$(CDVD_DIR)/ee
-INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
+INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
 INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
 GPVAL = -G0
 CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
--- a/Makefile.ps3
+++ b/Makefile.ps3
@ -39,7 +39,8 @@ INCDIRS = -I. \
 			 -Ideps/libz \
 			 -Ideps/stb \
 			 -Ideps/rcheevos/include \
-			 -Ilibretro-common/include
+			 -Ilibretro-common/include \
+			 -Ilibretro-common/include/compat/zlib

 # system platform
 system_platform = unix
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@ -17,7 +17,7 @@ ELF_TARGET := retroarch_psl1ght.elf
 EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.

 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
--- a/Makefile.psp1
+++ b/Makefile.psp1
@ -21,7 +21,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-INCDIR = deps deps/stb deps/libz deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include
+INCDIR = deps deps/stb deps/libz deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include libretro-common/include/compat/zlib
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)

--- a/Makefile.switch
+++ b/Makefile.switch
@ -46,7 +46,7 @@ endif

 include $(LIBTRANSISTOR_HOME)/libtransistor.mk

-INCDIRS := -I. -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
+INCDIRS := -I. -Ideps -Ideps/libz -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
 LIBDIRS := -L.

 TARGETS := $(TARGET).nro
--- a/Makefile.vita
+++ b/Makefile.vita
@ -83,7 +83,7 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
 LIBDIRS := -L.

 ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
--- a/Makefile.win
+++ b/Makefile.win
@ -81,7 +81,7 @@ OS               := Win32
 OBJ              :=
 LIBS             := -lm
 DEFINES			  :=
-DEFINES          += -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES          += -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_OVERLAY
 #DEFINES			  += -DHAVE_VIDEO_LAYOUT
 LDFLAGS          := -L. -static-libgcc

--- a/deps/libz/adler32.c
+++ b/deps/libz/adler32.c
@ -8,7 +8,7 @@
 #define ZLIB_INTERNAL
 #include <stdint.h>
 #include <stddef.h>
-#include <compat/zutil.h>
+#include <zutil.h>

 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
--- a/deps/libz/compress.c
+++ b/deps/libz/compress.c
@ -6,7 +6,7 @@
 /* @(#) $Id$ */

 #define ZLIB_INTERNAL
-#include <compat/zlib.h>
+#include <zlib.h>

 /* ===========================================================================
   Compresses the source buffer into the destination buffer. The level
--- a/deps/libz/deflate.h
+++ b/deps/libz/deflate.h
@ -13,7 +13,7 @@
 #ifndef DEFLATE_H
 #define DEFLATE_H

-#include <compat/zutil.h>
+#include <zutil.h>

 /* define NO_GZIP when compiling if you want to disable gzip header and
   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
--- a/deps/libz/gzguts.h
+++ b/deps/libz/gzguts.h
@ -22,7 +22,7 @@
 #endif

 #include <stdio.h>
-#include <compat/zlib.h>
+#include <zlib.h>
 #ifdef STDC
 #  include <string.h>
 #  include <stdlib.h>
--- a/deps/libz/inffast.c
+++ b/deps/libz/inffast.c
@ -3,7 +3,7 @@
 * For conditions of distribution and use, see copyright notice in zlib.h
 */

-#include <compat/zutil.h>
+#include <zutil.h>
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
--- a/deps/libz/inflate.c
+++ b/deps/libz/inflate.c
@ -80,7 +80,7 @@
   * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
   */

-#include <compat/zutil.h>
+#include <zutil.h>
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
--- a/deps/libz/inftrees.c
+++ b/deps/libz/inftrees.c
@ -3,7 +3,7 @@
 * For conditions of distribution and use, see copyright notice in zlib.h
 */

-#include <compat/zutil.h>
+#include <zutil.h>
 #include "inftrees.h"

 #define MAXBITS 15
--- a/deps/libz/uncompr.c
+++ b/deps/libz/uncompr.c
@ -6,7 +6,7 @@
 /* @(#) $Id$ */

 #define ZLIB_INTERNAL
-#include <compat/zlib.h>
+#include <zlib.h>

 /* ===========================================================================
   Decompresses the source buffer into the destination buffer.  sourceLen is
--- a/deps/libz/zutil.c
+++ b/deps/libz/zutil.c
@ -5,7 +5,7 @@

 /* @(#) $Id$ */

-#include <compat/zutil.h>
+#include <zutil.h>
 #ifndef Z_SOLO
 #  include "gzguts.h"
 #endif
--- a/libretro-common/file/archive_file_zlib.c
+++ b/libretro-common/file/archive_file_zlib.c
@ -31,7 +31,7 @@
 #include <encodings/crc32.h>

 /* Only for MAX_WBITS */
-#include <compat/zlib.h>
+#include <zlib.h>

 #ifndef CENTRAL_FILE_HEADER_SIGNATURE
 #define CENTRAL_FILE_HEADER_SIGNATURE 0x02014b50
--- a/libretro-common/include/compat/zlib/zconf.h
+++ b/libretro-common/include/compat/zlib/zconf.h
--- a/libretro-common/include/compat/zlib/zconf.h.in
+++ b/libretro-common/include/compat/zlib/zconf.h.in
--- a/libretro-common/include/compat/zlib/zlib.h
+++ b/libretro-common/include/compat/zlib/zlib.h
--- a/libretro-common/include/compat/zlib/zutil.h
+++ b/libretro-common/include/compat/zlib/zutil.h
@ -24,7 +24,7 @@
 #  define ZLIB_INTERNAL
 #endif

-#include <compat/zlib.h>
+#include <zlib.h>

 #if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
--- a/libretro-common/streams/trans_stream_zlib.c
+++ b/libretro-common/streams/trans_stream_zlib.c
@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <compat/zlib.h>
+#include <zlib.h>
 #include <string/stdstring.h>
 #include <streams/trans_stream.h>