From 20761eea7616608fbb1f7952921995fbed5c7b5e Mon Sep 17 00:00:00 2001
From: Egor00f <y.yarin@inbox.ru>
Date: Fri, 2 Oct 2026 00:28:59 +0500
Subject: [PATCH] update build

---
 .gitignore |  6 ++++--
 Makefile   | 29 ++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 192462e..c500f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 
-/build
-/build-i386
+/build-*
 
 *.deb
 
+/kolibrios/programs/develop/ktcc/source/kos32-tcc-*
+
+
diff --git a/Makefile b/Makefile
index 558dde6..26bb5de 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ Priority = optional
 Section = devel
 Depends = libc6
 Description = tcc for KolibriOS
-Homepage = 
+Homepage = https://git.kolibrios.org/Egor00f/tcc-package
 
 # Directories
 
 KOLIBRIOS_DIR=kolibrios
 
-BUILD_DIR=build
+BUILD_DIR=build-$(Architecture)
 
 
 # Utilities
@@ -33,7 +33,11 @@ PACKAGE_FILES = \
 	$(BUILD_DIR)/usr/bin/kos32-tcc
 
 
-default: $(PACKAGE_NAME).deb
+ALL_PACKAGES = \
+	amd64	\
+	i386
+
+default: $(ALL_PACKAGES)
 
 # Rules
 
@@ -46,7 +50,7 @@ TCC_DIR = kolibrios/programs/develop/ktcc/source
 $(TCC_DIR)/tcc.c $(TCC_DIR)/libtcc.c: 
 	git submodule update --init --recursive
 
-$(TCC_DIR)/kos32-tcc$(TCC_BINARY_POSTFIX): $(TCC_DIR)/tcc.c $(TCC_DIR)/libtcc.c
+$(TCC_DIR)/kos32-tcc-$(Architecture): $(TCC_DIR)/tcc.c $(TCC_DIR)/libtcc.c
 	$(CC) -DTCC_TARGET_MEOS_LINUX $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 ## dirs
@@ -78,20 +82,27 @@ $(BUILD_DIR)/DEBIAN/control: $(PACKAGE_FILES) Makefile | $(BUILD_DIR)/DEBIAN
 	echo "Description: $(Description)" >> $@
 
 
-$(BUILD_DIR)/usr/bin/kos32-tcc: $(TCC_DIR)/kos32-tcc Makefile | $(BUILD_DIR)/usr/bin
+$(BUILD_DIR)/usr/bin/kos32-tcc: $(TCC_DIR)/kos32-tcc-$(Architecture) Makefile | $(BUILD_DIR)/usr/bin
 	$(CP) $< $@
 
 
 # Debian packages
 
-$(PACKAGE_NAME).deb: $(DEBIAN_FILES) $(PACKAGE_FILES) Makefile | $(BUILD_DIR)
+$(PACKAGE_NAME)-$(Architecture).deb: $(DEBIAN_FILES) $(PACKAGE_FILES) Makefile | $(BUILD_DIR)
 	dpkg-deb --root-owner-group --build $(BUILD_DIR) $@
 
-$(PACKAGE_NAME)-i386.deb: Makefile
-	$(MAKE) "PACKAGE_NAME=$(PACKAGE_NAME)-i386" "CFLAGS=$(CFLAGS) -m32" "Architecture=i386" "BUILD_DIR=$(BUILD_DIR)-i386" $@
+amd64: Makefile
+	$(MAKE) "CC=x86_64-linux-gnu-gcc" "Architecture=$@" $(PACKAGE_NAME)-$@.deb
+
+i386: Makefile
+	$(MAKE) "CC=x86_64-linux-gnu-gcc -m32" "Architecture=$@" $(PACKAGE_NAME)-$@.deb
+
+
+
+
 
 clean: 
 	$(RM) $(BUILD_DIR)/* $(TCC_DIR)/kos32-tcc$(TCC_BINARY_POSTFIX)
 
 
-.PHONY: clean $(TCC_DIR)/kos32-tcc
+.PHONY: clean amd64 i386