mirror of
https://github.com/DarkMatterCore/nxdumptool.git
synced 2024-11-26 04:02:11 +00:00
Remove references to Freetype and LVGL.
This commit is contained in:
parent
1e58ed4f8a
commit
dd9cf1f41d
2 changed files with 1 additions and 17 deletions
3
Makefile
3
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 := -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 += -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 += -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 zlib --cflags`
|
||||||
CFLAGS += `aarch64-none-elf-pkg-config libxml-2.0 --cflags`
|
CFLAGS += `aarch64-none-elf-pkg-config libxml-2.0 --cflags`
|
||||||
CFLAGS += `aarch64-none-elf-pkg-config json-c --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)
|
ASFLAGS := -g $(ARCH)
|
||||||
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
|
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
|
# list of directories containing libraries, this must be the top level containing
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* utils.c
|
* utils.c
|
||||||
*
|
*
|
||||||
* Copyright (c) 2018-2020, WerWolv.
|
|
||||||
* Copyright (c) 2020-2021, DarkMatterCore <pabloacurielz@gmail.com>.
|
* Copyright (c) 2020-2021, DarkMatterCore <pabloacurielz@gmail.com>.
|
||||||
*
|
*
|
||||||
* This file is part of nxdumptool (https://github.com/DarkMatterCore/nxdumptool).
|
* This file is part of nxdumptool (https://github.com/DarkMatterCore/nxdumptool).
|
||||||
|
@ -22,8 +21,6 @@
|
||||||
#include <sys/statvfs.h>
|
#include <sys/statvfs.h>
|
||||||
|
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
//#include "freetype_helper.h"
|
|
||||||
//#include "lvgl_helper.h"
|
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "gamecard.h"
|
#include "gamecard.h"
|
||||||
#include "services.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). */
|
/* Setup an applet hook to change the hardware clocks after a system mode change (docked <-> undocked). */
|
||||||
appletHook(&g_systemOverclockCookie, utilsOverclockSystemAppletHook, NULL);
|
appletHook(&g_systemOverclockCookie, utilsOverclockSystemAppletHook, NULL);
|
||||||
|
|
||||||
/* Initialize FreeType. */
|
|
||||||
//if (!freeTypeHelperInitialize()) return false;
|
|
||||||
|
|
||||||
/* Initialize LVGL. */
|
|
||||||
//if (!lvglHelperInitialize()) return false;
|
|
||||||
|
|
||||||
ret = g_resourcesInit = true;
|
ret = g_resourcesInit = true;
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -205,12 +196,6 @@ void utilsCloseResources(void)
|
||||||
{
|
{
|
||||||
mutexLock(&g_resourcesMutex);
|
mutexLock(&g_resourcesMutex);
|
||||||
|
|
||||||
/* Free LVGL resources. */
|
|
||||||
//lvglHelperExit();
|
|
||||||
|
|
||||||
/* Free FreeType resources. */
|
|
||||||
//freeTypeHelperExit();
|
|
||||||
|
|
||||||
/* Unset our overclock applet hook. */
|
/* Unset our overclock applet hook. */
|
||||||
appletUnhook(&g_systemOverclockCookie);
|
appletUnhook(&g_systemOverclockCookie);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue