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
This commit is contained in:
maxcodehack 2020-11-06 14:59:59 +00:00
parent d45967888e
commit d54f7bb7b1
3 changed files with 11 additions and 10 deletions

View File

@ -1,4 +1,5 @@
SVN_BCC32:=../.. SVN_PROGR:=../../../
SVN_BCC32:=$(SVN_PROGR)/bcc32
T2FASM:=$(SVN_BCC32)/t2fasm T2FASM:=$(SVN_BCC32)/t2fasm
INCLUDE:=$(SVN_BCC32)/include INCLUDE:=$(SVN_BCC32)/include
@ -8,7 +9,7 @@ KOS32_BCC:=/home/autobuild/borlandcpp/bin
# Filename # Filename
FN:=hello 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 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 echo 'include "kos_make.inc"' > f_$(FN).asm
$(T2FASM)/t2fasm < $(FN).asm >> f_$(FN).asm $(T2FASM)/t2fasm < $(FN).asm >> f_$(FN).asm
@ -16,3 +17,7 @@ hello_world:
rm f_$(FN).asm rm f_$(FN).asm
rm $(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

View File

@ -1,6 +1,9 @@
kos32-bcc -S -v- -R- -6 -a4 -O2 -Og -Oi -Ov -OS -k- -D__KOLIBRI__ -Iinclude hello.cpp 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 echo include "kos_make.inc" > f_hello.asm
t2fasm < hello.asm >> f_hello.asm t2fasm < hello.asm >> f_hello.asm
fasm f_hello.asm hello.kex fasm f_hello.asm hello.kex
kpack hello.kex kpack hello.kex
pause pause

View File

@ -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"