From dd9cf1f41dc820e296f61666ff774bd4087cfcf3 Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Thu, 25 Mar 2021 03:22:32 -0400 Subject: [PATCH] Remove references to Freetype and LVGL. --- Makefile | 3 +-- source/utils.c | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 0475bc6..79c35b3 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,6 @@ ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE CFLAGS := -g -Wall -Wextra -Werror -O2 -ffunction-sections $(ARCH) $(DEFINES) $(INCLUDE) -D__SWITCH__ CFLAGS += -DVERSION_MAJOR=${VERSION_MAJOR} -DVERSION_MINOR=${VERSION_MINOR} -DVERSION_MICRO=${VERSION_MICRO} -DAPP_TITLE=\"${APP_TITLE}\" -DAPP_AUTHOR=\"${APP_AUTHOR}\" -DAPP_VERSION=\"${APP_VERSION}\" CFLAGS += -DGIT_BRANCH=\"${GIT_BRANCH}\" -DGIT_COMMIT=\"${GIT_COMMIT}\" -CFLAGS += `freetype-config --cflags` CFLAGS += `aarch64-none-elf-pkg-config zlib --cflags` CFLAGS += `aarch64-none-elf-pkg-config libxml-2.0 --cflags` CFLAGS += `aarch64-none-elf-pkg-config json-c --cflags` @@ -75,7 +74,7 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++1z -O2 -Wno-volatile ASFLAGS := -g $(ARCH) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -lxml2 -lz -lusbhsfs -lntfs-3g -llwext4 -lnx -ljson-c -lm `freetype-config --libs` -lturbojpeg +LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -lxml2 -lz -lusbhsfs -lntfs-3g -llwext4 -lnx -ljson-c -lm -lturbojpeg #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/source/utils.c b/source/utils.c index 0e37c87..3329b55 100644 --- a/source/utils.c +++ b/source/utils.c @@ -1,7 +1,6 @@ /* * utils.c * - * Copyright (c) 2018-2020, WerWolv. * Copyright (c) 2020-2021, DarkMatterCore . * * This file is part of nxdumptool (https://github.com/DarkMatterCore/nxdumptool). @@ -22,8 +21,6 @@ #include #include "utils.h" -//#include "freetype_helper.h" -//#include "lvgl_helper.h" #include "keys.h" #include "gamecard.h" #include "services.h" @@ -185,12 +182,6 @@ bool utilsInitializeResources(void) /* Setup an applet hook to change the hardware clocks after a system mode change (docked <-> undocked). */ appletHook(&g_systemOverclockCookie, utilsOverclockSystemAppletHook, NULL); - /* Initialize FreeType. */ - //if (!freeTypeHelperInitialize()) return false; - - /* Initialize LVGL. */ - //if (!lvglHelperInitialize()) return false; - ret = g_resourcesInit = true; end: @@ -205,12 +196,6 @@ void utilsCloseResources(void) { mutexLock(&g_resourcesMutex); - /* Free LVGL resources. */ - //lvglHelperExit(); - - /* Free FreeType resources. */ - //freeTypeHelperExit(); - /* Unset our overclock applet hook. */ appletUnhook(&g_systemOverclockCookie);