diff --git a/Dockerfile b/Dockerfile index 1458379..3d8d743 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM wiiuenv/devkitppc:20220303 -COPY --from=wiiuenv/libkernel:20211031 /artifacts $DEVKITPRO COPY --from=wiiuenv/wiiumodulesystem:20220123 /artifacts $DEVKITPRO COPY --from=wiiuenv/libsdutils:20220303 /artifacts $DEVKITPRO diff --git a/Makefile b/Makefile index de9f891..602d1fe 100644 --- a/Makefile +++ b/Makefile @@ -36,14 +36,14 @@ CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__ CXXFLAGS := $(CFLAGS) -std=c++17 ASFLAGS := -g $(ARCH) -LDFLAGS = -g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) -T$(WUMS_ROOT)/share/libkernel.ld $(WUMSSPECS) +LDFLAGS = -g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) $(WUMSSPECS) ifeq ($(DEBUG),1) CXXFLAGS += -DDEBUG -g CFLAGS += -DDEBUG -g endif -LIBS := -lwums -lwut -lkernel +LIBS := -lwums -lwut #------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level