minor

Author: stsaz

Makefile

@@ -191,7 +191,7 @@ endif
 SETUP_EXE := phiola-$(PKG_VER)-windows-x64-setup.exe
 setup_exe: $(SETUP_EXE)
 $(SETUP_EXE): phiola-$(PKG_VER)-windows-x64.zip
-	$(MAKE) -f ../installer/exe/Makefile
+	$(MAKE) -f $(PHIOLA)/installer/exe/Makefile  ROOT=$(ROOT_DIR) COMPILER=$(COMPILER)
 
 release: default
 	$(SUBMAKE) package

alib3/vorbis/Makefile

@@ -3,7 +3,7 @@
 include ../config.mk
 
 VER := 1.3.7
-URL := http://downloads.xiph.org/releases/vorbis/libvorbis-$(VER).tar.xz
+URL := https://github.com/xiph/vorbis/releases/download/v$(VER)/libvorbis-$(VER).tar.xz
 SHA256SUM := b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b
 PKG := $(ALIB3)/vorbis/$(notdir $(URL))
 DIR := libvorbis-$(VER)

builder/build.sh

@@ -15,6 +15,7 @@ VER="${TAG#v}"
 
 case "$TARGET" in
 	linux-amd64)
+		ARGS=""
 		;;
 
 	linux-arm64)
@@ -35,8 +36,8 @@ export PATH="$PATH:/usr/lib/llvm-19/bin"
 mkdir -p _$TARGET
 make -j$(nproc) \
 	-C _$TARGET \
-	-f ../Makefile \
-	ROOT_DIR=../.. \
+	-f /src/phiola/Makefile \
+	ROOT_DIR=/src \
 	COMPILER=clang \
 	CFLAGS_USER=-fno-diagnostics-color \
 	PHI_VERSION_STR="$VER" \

installer/exe/Makefile

@@ -8,7 +8,7 @@ FFSYS := $(ROOT)/ffsys
 FFBASE := $(ROOT)/ffbase
 
 include $(FFBASE)/conf.mk
-FFPACK_BIN := $(FFPACK)/_windows-$(CPU)
+FFPACK_BIN := ffpack
 FFPACK_FLAGS := OS=$(OS) SYS=$(SYS) COMPILER=$(COMPILER) CPU=$(CPU)
 ifneq "$(SYS)" "android"
 	FFPACK_FLAGS += LINKFLAGS_USER='-fuse-ld=lld'
@@ -27,7 +27,8 @@ OBJ += \
 	ffgui-winapi.o \
 	ffgui-winapi-loader.o \
 	str-format.o
-LINKFLAGS += -Wl,--gc-sections \
+LINKFLAGS += -fuse-ld=lld \
+	-Wl,--gc-sections \
 	-lshell32 -luxtheme -lcomctl32 -lcomdlg32 -lgdi32 -lole32 -luuid
 
 ifeq "$(DEBUG)" "1"

src/tui2/Makefile

@@ -11,7 +11,7 @@ else ifeq "$(OS)" "windows"
 	LIBS3 += $(LIBCURSES)
 endif
 
-tui2.o: $(PHIOLA)/src/tui2/tui2.c
+tui2.o: $(PHIOLA)/src/tui2/tui2.c | $(LIBCURSES)
 	$(C) $(CFLAGS) $(CF_CURSES) $< -o $@
 
 tui2.$(SO): tui2.o $(LIBCURSES)

src/tui2/pdcurses.mk

@@ -11,6 +11,8 @@ CC := clang -target x86_64-w64-mingw32
 WINDRES := llvm-windres
 STRIP := llvm-strip
 
+default: $(LIB)
+
 $(PKG):
 	$(CURL) $@ $(URL)
 
@@ -22,5 +24,6 @@ $(LIB): $(DIR)
 	cd $(DIR)/wincon \
 		&& $(MAKE) DLL=Y WIDE=Y UTF8=Y \
 		CC="$(CC)" \
+		LIBFLAGS="-fuse-ld=lld -shared -o" \
 		WINDRES=$(WINDRES)
 	$(STRIP) $@