joel16/NX-Shell
1
0
Fork 0
mirror of https://github.com/joel16/NX-Shell.git synced 2024-11-23 11:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silence warnings on stb_image.h and minor makefile changes

Browse Source
This commit is contained in:
Joel16 2020-08-18 22:31:51 -04:00
parent 507dff61ff
commit f4971bdd61
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -42,7 +42,7 @@ BUILD := build
SOURCES := libs/source libs/source/imgui source source/windows source/popups
DATA := data
INCLUDES := libs/include libs/include/imgui include
ROMFS := romfs
ROMFS := romfs
VERSION_MAJOR := 3
VERSION_MINOR := 0
@ -57,14 +57,15 @@ APP_VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}
#---------------------------------------------------------------------------------
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O3 -ffunction-sections -Wno-format-truncation \
-DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) \
-DIMGUI_IMPL_OPENGL_LOADER_GLAD \
$(ARCH) $(DEFINES)
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)
CFLAGS += -D__SWITCH__ $(INCLUDE) `sdl2-config --cflags` -DDEBUG
CFLAGS += $(INCLUDE) -D__SWITCH__
CFLAGS += `sdl2-config --cflags`
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO)
CFLAGS += -DIMGUI_IMPL_OPENGL_LOADER_GLAD -DDEBUG
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
CXXFLAGS := $(CFLAGS) -std=gnu++17 -fno-exceptions -fno-rtti
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

2
include/config.h
View File

@ -7,7 +7,7 @@
typedef struct {
int sort = 0;
bool dark_theme = false;
char cwd[FS_MAX_PATH];
char cwd[FS_MAX_PATH + 1];
} config_t;
extern config_t config;

6
libs/include/imgui/stb_image.h
View File

@ -120,6 +120,8 @@ RECENT REVISION HISTORY:
of the credits.
*/
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#ifndef STBI_INCLUDE_STB_IMAGE_H
#define STBI_INCLUDE_STB_IMAGE_H
@ -4120,7 +4122,7 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
if (s >= 16) return -1; // invalid code!
// code size is s, so:
b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
if (b >= sizeof (z->size)) return -1; // some data was corrupt somewhere!
if (b >= (int)sizeof (z->size)) return -1; // some data was corrupt somewhere!
if (z->size[b] != s) return -1; // was originally an assert, but report failure instead.
a->code_buffer >>= s;
a->num_bits -= s;
@ -7535,6 +7537,8 @@ STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user
#endif // STB_IMAGE_IMPLEMENTATION
#pragma GCC diagnostic pop
/*
revision history:
2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs