Skip to content

Commit

Permalink
makefile: allow LIBDIRS to be modified externally, pass on PC builds
Browse files Browse the repository at this point in the history
  • Loading branch information
vgmoose committed Dec 16, 2023
1 parent 138cf33 commit cdde6a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions helpers/Makefile.pc
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ else
endif

pc: $(OFILES)
$(CXX) $(OFILES) $(LDFLAGS) -o $(BINARY).bin -fstack-protector-all
$(CXX) $(OFILES) $(LDFLAGS) $(LIBPATHS) -o $(BINARY).bin -fstack-protector-all

pc-sdl1: $(OFILES)
$(CXX) $(OFILES) $(LDFLAGS) -o $(BINARY).bin-sdl1 -fstack-protector-all $(FRAMEWORK_FLAGS)
$(CXX) $(OFILES) $(LDFLAGS) $(LIBPATHS) -o $(BINARY).bin-sdl1 -fstack-protector-all $(FRAMEWORK_FLAGS)

%.o: %.cpp %.c
$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDE) $< -c -o $@ -fstack-protector-all
2 changes: 1 addition & 1 deletion helpers/Makefile.wiiu
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LDFLAGS += -g $(MACHDEP) $(RPXSPECS) -Wl,-Map,$(notdir $*.map)
LIBS += -lmodplug -lmpg123 -lvorbisidec -logg -lSDL2 -lwut -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lz -lwut -lharfbuzz -lfreetype

BUILD := build_wiiu
LIBDIRS := $(PORTLIBS) $(WUT_ROOT)
LIBDIRS += $(PORTLIBS) $(WUT_ROOT)

SOURCES += $(CHESTO_DIR)/libs/wiiu_kbd
VPATH += $(CHESTO_DIR)/libs/wiiu_kbd
Expand Down

0 comments on commit cdde6a3

Please sign in to comment.