The-Homebrew-Cloud/WiiUIdent
2
0
Fork 0
mirror of https://github.com/GaryOderNichts/WiiUIdent.git synced 2025-02-17 08:46:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update for latest libraries

Browse Source
This commit is contained in:
GaryOderNichts 2023-04-17 22:40:54 +02:00
parent df66e207da
commit 0143b2e867
5 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Dockerfile
View File

@ -1,32 +1,5 @@
FROM ghcr.io/wiiu-env/devkitppc:20230326 FROM ghcr.io/wiiu-env/devkitppc:20230417
COPY --from=ghcr.io/wiiu-env/libmocha:20220903 /artifacts $DEVKITPRO COPY --from=ghcr.io/wiiu-env/libmocha:20230417 /artifacts $DEVKITPRO
# build and install latest wut
WORKDIR /
RUN \
mkdir wut && \
cd wut && \
git init . && \
git remote add origin https://github.com/devkitPro/wut.git && \
git fetch --depth 1 origin 451a1828f7646053b59ebacd813135e0300c67e8 && \
git checkout FETCH_HEAD
WORKDIR /wut
RUN make -j$(nproc)
RUN make install
# build and install latest sdl
WORKDIR /
RUN \
mkdir SDL && \
cd SDL && \
git init . && \
git remote add origin https://github.com/GaryOderNichts/SDL.git && \
git fetch --depth 1 origin 687746c8c9514b5d48d5f9665a1d5fa36c5e5547 && \
git checkout FETCH_HEAD
WORKDIR /SDL
RUN /opt/devkitpro/portlibs/wiiu/bin/powerpc-eabi-cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$DEVKITPRO/portlibs/wiiu
RUN cmake --build build
RUN cmake --install build
WORKDIR /project WORKDIR /project

2
Makefile
View File

@ -56,7 +56,7 @@ CXXFLAGS := $(CFLAGS) -std=gnu++20
ASFLAGS := $(ARCH) ASFLAGS := $(ARCH)
LDFLAGS = $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) LDFLAGS = $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map)
LIBS := -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lSDL2 -lSDL2_ttf -lfreetype -lpng -lbz2 -lz -lmocha -lwut LIBS := -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lSDL2 -lSDL2_ttf -lfreetype -lharfbuzz -lfreetype -lpng -lbz2 -lz -lmocha -lwut
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level # list of directories containing libraries, this must be the top level

3
README.md
View File

@ -51,7 +51,8 @@ The database is publicly accessible but personally identifying information will
For building you need: For building you need:
- [wut](https://github.com/devkitPro/wut) - [wut](https://github.com/devkitPro/wut)
- [libmocha](https://github.com/wiiu-env/libmocha) - [libmocha](https://github.com/wiiu-env/libmocha)
- [SDL2 v2.22](https://github.com/GaryOderNichts/SDL/tree/wiiu-sdl2-2.0.22) - [wiiu-sdl2](https://github.com/GaryOderNichts/SDL/tree/wiiu-sdl2-2.26)
- wiiu-sdl2_ttf
- wiiu-curl - wiiu-curl
- wiiu-mbedtls - wiiu-mbedtls

3
source/Gfx.cpp
View File

@ -106,9 +106,6 @@ bool Init()
return false; return false;
} }
// FIXME Probably SDL bug? If we don't draw before FC_LoadFont_RW our viewport shrinks
Gfx::DrawRectFilled(0, 0, 0, 0, COLOR_BLACK);
if (!FC_LoadFont_RW(monospaceFont, renderer, SDL_RWFromMem((void*)ter_u32b_bdf, ter_u32b_bdf_size), 1, 32, Gfx::COLOR_BLACK, TTF_STYLE_NORMAL)) { if (!FC_LoadFont_RW(monospaceFont, renderer, SDL_RWFromMem((void*)ter_u32b_bdf, ter_u32b_bdf_size), 1, 32, Gfx::COLOR_BLACK, TTF_STYLE_NORMAL)) {
FC_FreeFont(monospaceFont); FC_FreeFont(monospaceFont);
return false; return false;

14
source/screens/GeneralScreen.cpp
View File

@ -8,20 +8,6 @@
#include <coreinit/mcp.h> #include <coreinit/mcp.h>
#include <coreinit/bsp.h> #include <coreinit/bsp.h>
extern "C"
{
typedef struct {
uint32_t major;
uint32_t minor;
uint32_t patch;
char region;
} MCPSystemVersion;
MCPError MCP_GetSystemVersion(int32_t handle, MCPSystemVersion* systemVersion);
}
namespace namespace
{ {