libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

RZIP command line tool fixes

Browse Source
This commit is contained in:
jdgleaver 2020-12-11 11:00:19 +00:00
parent 4c98be1aa8
commit 73c53b63bf
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libretro-common/samples/streams/rzip/Makefile
View File

@ -1,8 +1,7 @@
TARGET := rzip
LIBRETRO_COMM_DIR := ../../..
LDFLAGS += -lz
LIBRETRO_DEPS_DIR := ../../../../deps
SOURCES := \
rzip.c \
@ -27,14 +26,39 @@ SOURCES := \
$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \
$(LIBRETRO_COMM_DIR)/time/rtime.c
OBJS := $(SOURCES:.c=.o)
ifneq ($(wildcard $(LIBRETRO_DEPS_DIR)/*),)
# If we are building from inside the RetroArch
# directory (i.e. if an 'external' deps directory
# is avaiable), bake in zlib support
SOURCES += \
$(LIBRETRO_DEPS_DIR)/libz/adler32.c \
$(LIBRETRO_DEPS_DIR)/libz/libz-crc32.c \
$(LIBRETRO_DEPS_DIR)/libz/deflate.c \
$(LIBRETRO_DEPS_DIR)/libz/gzclose.c \
$(LIBRETRO_DEPS_DIR)/libz/gzlib.c \
$(LIBRETRO_DEPS_DIR)/libz/gzread.c \
$(LIBRETRO_DEPS_DIR)/libz/gzwrite.c \
$(LIBRETRO_DEPS_DIR)/libz/inffast.c \
$(LIBRETRO_DEPS_DIR)/libz/inflate.c \
$(LIBRETRO_DEPS_DIR)/libz/inftrees.c \
$(LIBRETRO_DEPS_DIR)/libz/trees.c \
$(LIBRETRO_DEPS_DIR)/libz/zutil.c
INCLUDE_DIRS := -I$(LIBRETRO_COMM_DIR)/include/compat/zlib
else
# If this is a stand-alone libretro-common directory,
# rely on system zlib library (note: only likely to
# work on Unix-based platforms...)
LDFLAGS += -lz
endif
CFLAGS += -DHAVE_ZLIB -Wall -pedantic -std=gnu99 -I$(LIBRETRO_COMM_DIR)/include
OBJS := $(SOURCES:.c=.o)
INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include
CFLAGS += -DHAVE_ZLIB -Wall -pedantic -std=gnu99 $(INCLUDE_DIRS)
ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g -DDEBUG -D_DEBUG
CFLAGS += -O0 -g -DDEBUG -D_DEBUG
else
CFLAGS += -O2 -DNDEBUG
CFLAGS += -O2 -DNDEBUG
endif
all: $(TARGET)

9
libretro-common/samples/streams/rzip/rzip.c
View File

@ -24,6 +24,7 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <inttypes.h>
#include <errno.h>
#include <time.h>
@ -216,9 +217,9 @@ int main(int argc, char *argv[])
printf("%s: %s\n",
in_file_compressed ? "File is in RZIP format" : "File is NOT in RZIP format",
in_file_path);
printf(" Size on disk: %li bytes\n", in_file_size);
printf(" Size on disk: %" PRIi64 " bytes\n", in_file_size);
if (in_file_compressed)
printf(" Uncompressed size: %li bytes\n", in_file_raw_size);
printf(" Uncompressed size: %" PRIi64 " bytes\n", in_file_raw_size);
goto end;
}
@ -311,7 +312,7 @@ int main(int argc, char *argv[])
}
/* Update progress */
printf("\rProgress: %li %%", total_data_read * 100 / in_file_raw_size);
printf("\rProgress: %" PRIi64 " %%", total_data_read * 100 / in_file_raw_size);
fflush(stdout);
}
printf("\rProgress: 100 %%\n");
@ -324,7 +325,7 @@ int main(int argc, char *argv[])
(in_file_size - out_file_size) :
(out_file_size - in_file_size);
printf(" %li -> %li bytes [%li %% %s]\n",
printf(" %" PRIi64 " -> %" PRIi64 " bytes [%" PRIi64 " %% %s]\n",
in_file_size, out_file_size,
file_size_diff * 100 / in_file_size,
(out_file_size >= in_file_size) ?