Magic-Mirror/ftpd
1
0
Fork 0
mirror of https://github.com/mtheall/ftpd.git synced 2024-11-23 01:29:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use full pkg-config path

Browse Source
This commit is contained in:
Michael Theall 2020-12-30 14:10:46 -05:00
parent fd4ed041b0
commit f9fd825599
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.3ds
View File

@ -72,7 +72,7 @@ CFLAGS += $(INCLUDE) -DARM11 -D_3DS \
-DSTATUS_STRING="\"ftpd v$(VERSION)\"" \
-DIMGUI_DISABLE_INCLUDE_IMCONFIG_H=1 \
-DNO_IPV6 -DFTPDCONFIG="\"/config/ftpd/ftpd.cfg\"" \
`$(PREFIX)pkg-config --cflags zlib` \
`$(DEVKITPRO)/portlibs/3ds/bin/$(PREFIX)pkg-config --cflags zlib` \
-DANTI_ALIAS=1
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
@ -83,7 +83,7 @@ LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) $(OPTIMIZE)
CC := `which ccache 2>/dev/null` $(CC)
CXX := `which ccache 2>/dev/null` $(CXX)
LIBS := `$(PREFIX)pkg-config --libs zlib` -lcitro3d -lctru -lm
LIBS := `$(DEVKITPRO)/portlibs/3ds/bin/$(PREFIX)pkg-config --libs zlib` -lcitro3d -lctru -lm
#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing

4
Makefile.nds
View File

@ -48,7 +48,7 @@ CFLAGS := -g -Wall $(OPTIMIZE) \
-DSTATUS_STRING="\"ftpd v$(VERSION)\"" \
-DIMGUI_DISABLE_INCLUDE_IMCONFIG_H=1 \
-DNO_IPV6 -DCLASSIC -DFTPDCONFIG="\"/config/ftpd/ftpd.cfg\"" \
`$(PREFIX)pkg-config --cflags zlib`
`$(DEVKITPRO)/portlibs/nds/bin/$(PREFIX)pkg-config --cflags zlib`
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) $(OPTIMIZE)
@ -59,7 +59,7 @@ CXX := `which ccache 2>/dev/null` $(CXX)
#---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project (order is important)
#---------------------------------------------------------------------------------
LIBS := `$(PREFIX)pkg-config --libs zlib` -lfat -ldswifi9 -lnds9
LIBS := `$(DEVKITPRO)/portlibs/nds/bin/$(PREFIX)pkg-config --libs zlib` -lfat -ldswifi9 -lnds9
# automatigically add libraries for NitroFS
ifneq ($(strip $(NITRO)),)

4
Makefile.switch
View File

@ -75,7 +75,7 @@ CFLAGS += $(INCLUDE) -D__SWITCH__ \
-DSTATUS_STRING="\"ftpd v$(VERSION)\"" \
-DIMGUI_DISABLE_INCLUDE_IMCONFIG_H=1 \
-DFTPDCONFIG="\"/config/ftpd/ftpd.cfg\"" \
`$(PREFIX)pkg-config --cflags libzstd zlib`
`$(DEVKITPRO)/portlibs/switch/bin/$(PREFIX)pkg-config --cflags libzstd zlib`
CXXFLAGS := $(CFLAGS) -std=gnu++17 -fno-exceptions -fno-rtti
@ -86,7 +86,7 @@ LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) \
CC := `which ccache 2>/dev/null` $(CC)
CXX := `which ccache 2>/dev/null` $(CXX)
LIBS := `$(PREFIX)pkg-config --libs libzstd zlib` -ldeko3d -lnx
LIBS := `$(DEVKITPRO)/portlibs/switch/bin/$(PREFIX)pkg-config --libs libzstd zlib` -ldeko3d -lnx
#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing