From d54f7bb7b15579c8de5ddf83d81b5b036b9fcf29 Mon Sep 17 00:00:00 2001
From: maxcodehack <maxcodehack@kolibrios.org>
Date: Fri, 6 Nov 2020 14:59:59 +0000
Subject: [PATCH] Remove hardcoded kos_make.inc, now it will generate via
 Makefile or hello_cpp.bat

git-svn-id: svn://kolibrios.org@8145 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/bcc32/examples/window/Makefile      | 9 +++++++--
 programs/bcc32/examples/window/hello_cpp.bat | 5 ++++-
 programs/bcc32/examples/window/kos_make.inc  | 7 -------
 3 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100755 programs/bcc32/examples/window/kos_make.inc

diff --git a/programs/bcc32/examples/window/Makefile b/programs/bcc32/examples/window/Makefile
index c2e061b186..7ac3ad34cb 100755
--- a/programs/bcc32/examples/window/Makefile
+++ b/programs/bcc32/examples/window/Makefile
@@ -1,4 +1,5 @@
-SVN_BCC32:=../..
+SVN_PROGR:=../../../
+SVN_BCC32:=$(SVN_PROGR)/bcc32
 T2FASM:=$(SVN_BCC32)/t2fasm
 INCLUDE:=$(SVN_BCC32)/include
 
@@ -8,7 +9,7 @@ KOS32_BCC:=/home/autobuild/borlandcpp/bin
 # Filename
 FN:=hello
 
-hello_world:
+hello_world: kos_make
 	wine $(KOS32_BCC)/kos32-bcc -S -v- -R- -6 -a4 -O2 -Og -Oi -Ov -OS -k- -D__KOLIBRI__ -I$(INCLUDE) $(FN).cpp
 	echo 'include "kos_make.inc"' > f_$(FN).asm
 	$(T2FASM)/t2fasm < $(FN).asm >> f_$(FN).asm
@@ -16,3 +17,7 @@ hello_world:
 	
 	rm f_$(FN).asm
 	rm $(FN).asm
+	rm kos_make.inc
+
+kos_make:
+	echo 'STACKSIZE equ 102400 \n HEAPSIZE equ 102400 \n include "$(SVN_PROGR)/proc32.inc" \ninclude "$(INCLUDE)/kos_start.inc" \n include "$(INCLUDE)/kos_func.inc" \n include "$(INCLUDE)/kos_heap.inc"' > kos_make.inc
diff --git a/programs/bcc32/examples/window/hello_cpp.bat b/programs/bcc32/examples/window/hello_cpp.bat
index c3128d40ed..2dd282f824 100755
--- a/programs/bcc32/examples/window/hello_cpp.bat
+++ b/programs/bcc32/examples/window/hello_cpp.bat
@@ -1,6 +1,9 @@
 kos32-bcc -S -v- -R- -6 -a4 -O2 -Og -Oi -Ov -OS -k- -D__KOLIBRI__ -Iinclude hello.cpp
+
+echo STACKSIZE equ 102400 \n HEAPSIZE equ 102400 \n include "..\..\..\proc32.inc" \ninclude "$(INCLUDE)/kos_start.inc" \n include "$(INCLUDE)/kos_func.inc" \n include "$(INCLUDE)/kos_heap.inc" > kos_make.inc
+
 echo include "kos_make.inc" > f_hello.asm
 t2fasm < hello.asm >> f_hello.asm
 fasm f_hello.asm hello.kex
 kpack hello.kex
-pause
\ No newline at end of file
+pause
diff --git a/programs/bcc32/examples/window/kos_make.inc b/programs/bcc32/examples/window/kos_make.inc
deleted file mode 100755
index 45f15fb720..0000000000
--- a/programs/bcc32/examples/window/kos_make.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-STACKSIZE   equ 102400
-HEAPSIZE    equ 102400
-
-include "..\..\..\proc32.inc"
-include "..\..\include\kos_start.inc"
-include "..\..\include\kos_func.inc"
-include "..\..\include\kos_heap.inc"