Skip to content

Commit 3cfbea7

Browse files
committed
Improved/cleaned up library build process
1 parent 2eb2420 commit 3cfbea7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1567
-2352
lines changed

CEdev/bin/main_makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ endif
9595
#Define the nesassary headers, along with any the user may have defined, where modification should just trigger a build
9696
USERHEADERS := $(call WINPATH,$(foreach dir,$(ALLDIRS),$(wildcard $(dir)*.h)))
9797
HEADERS := $(subst $(space),;,$(call WINPATH,. $(ALLDIRS) $(addprefix $(CEDEV)/,. include include/asm include/lib/ce include/lib/std $(LIBLOC))))
98-
LIBRARIES := $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,ce/ctice.lib ce/cdebug.lib ce/cintce.lib ce/cusbce.lib chelp.lib crt.lib))
98+
LIBRARIES := $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,ce/ctice.lib ce/cdebug.lib ce/cintce.lib ce/cusbce.lib crt.lib))
9999
ifneq ($(USE_FLASH_FUNCTIONS),NO)
100100
LIBRARIES += $(call WINPATH,$(addprefix $(CEDEV)/lib/std/,crt_linked.lib))
101101
else

CEdev/lib/ce/fileioc/fileioc.asm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
define .FILEIOC_HEADER,space=ram
2-
define .FILEIOC,space=ram
3-
segment .FILEIOC_HEADER
4-
.assume ADL=1
5-
db 192,"FILEIOC",0,3
6-
end
1+
define .FILEIOC_HEADER,space=ram
2+
define .FILEIOC,space=ram
3+
segment .FILEIOC_HEADER
4+
.assume ADL=1
5+
db 192,"FILEIOC",0,3
6+
end

CEdev/lib/ce/graphc/graphc.asm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
define .GRAPHC_HEADER,space=ram
2-
define .GRAPHC,space=ram
3-
segment .GRAPHC_HEADER
4-
.assume ADL=1
5-
db 192,"GRAPHC",0,3
6-
end
1+
define .GRAPHC_HEADER,space=ram
2+
define .GRAPHC,space=ram
3+
segment .GRAPHC_HEADER
4+
.assume ADL=1
5+
db 192,"GRAPHC",0,3
6+
end

CEdev/lib/ce/graphx/graphx.asm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.assume ADL=1
2-
define .GRAPHX_HEADER,space=ram
3-
define .GRAPHX,space=ram
4-
segment .GRAPHX_HEADER
5-
db 192,"GRAPHX",0,4
6-
end
1+
define .GRAPHX_HEADER,space=ram
2+
define .GRAPHX,space=ram
3+
segment .GRAPHX_HEADER
4+
.assume ADL=1
5+
db 192,"GRAPHX",0,4
6+
end

CEdev/lib/ce/keypadc/keypadc.asm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
define .KEYPADC_HEADER,space=ram
2-
define .KEYPADC,space=ram
3-
segment .KEYPADC_HEADER
4-
.assume ADL=1
5-
db 192,"KEYPADC",0,2
6-
end
1+
define .KEYPADC_HEADER,space=ram
2+
define .KEYPADC,space=ram
3+
segment .KEYPADC_HEADER
4+
.assume ADL=1
5+
db 192,"KEYPADC",0,2
6+
end

CEdev/lib/src/buildall.bat

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
setlocal enabledelayedexpansion
23

34
REM ----------------------------------------------------
45
REM Batch file to build all runtime libraries
@@ -14,8 +15,8 @@ set BIN=%CEDEV%\bin
1415
set INC=%CEDEV%\include
1516
set LIBPATH=%CEDEV%\lib
1617
set SHARED_PATH=std\shared
17-
set STATIC_PATH=std\os_functions_static
18-
set LINKED_PATH=std\os_functions_linked
18+
set STATIC_PATH=std\static
19+
set LINKED_PATH=std\linked
1920
set CE_PATH=ce
2021

2122
set ASM=%BIN%\ez80asm.exe
@@ -24,17 +25,14 @@ set LIB=%BIN%\ez80lib.exe
2425

2526
REM -- Static and linked hold the same file names --
2627

27-
set RTL_STATIC_C_SRC=asin.c atan.c atan2.c exp.c floor.c fmod.c frexp.c ldexp.c log.c log10.c modf.c pow.c sin.c sinh.c sqrt.c strtod.c tan.c tanh.c ufltinfo.c ufltrnd.c
28-
set RTL_STATIC_ASM_SRC=acos.asm atof.asm ceil.asm cos.asm fabs.asm isalnum.asm isalpha.asm iscntrl.asm isdigit.asm isgraph.asm islower.asm isprint.asm ispunct.asm isspace.asm isupper.asm isxdigit.asm
28+
call :setfiles RTL_STATIC_C_SRC %STATIC_PATH%\*.c
29+
call :setfiles RTL_STATIC_ASM_SRC %STATIC_PATH%\*.asm
2930

30-
set RTL_LINKED_C_SRC=
31-
set RTL_LINKED_ASM_SRC=acos.asm asin.asm atan.asm atan2.asm atof.asm ceil.asm cos.asm cosh.asm exp.asm fabs.asm floor.asm fmod.asm frexp.asm isalnum.asm isalpha.asm iscntrl.asm isdigit.asm isgraph.asm islower.asm isprint.asm ispunct.asm isspace.asm isupper.asm isxdigit.asm ldexp.asm log.asm log10.asm modf.asm pow.asm sin.asm sinh.asm sqrt.asm strtod.asm tan.asm tanh.asm ufltinfo.asm ufltrnd.asm
31+
call :setfiles RTL_LINKED_C_SRC %LINKED_PATH%\*.c
32+
call :setfiles RTL_LINKED_ASM_SRC %LINKED_PATH%\*.asm
3233

33-
set RTL_SHARED_C_SRC=bsearch.c fpdata.c free.c gamma.c malloc.c maptab.c qsort.c realloc.c strtol.c strtoul.c udtoe.c udtof.c udtog.c uitoa.c ultoa.c ureverse.c ustoa.c uuitoa.c uultoa.c uustoa.c vsprintf.c
34-
set RTL_SHARED_ASM_SRC=abs.asm atoi.asm atol.asm atos.asm calloc.asm div.asm finite.asm fpadd.asm fpcmp.asm fpdiv.asm fpftol.asm fpltof.asm fpmul.asm fpneg.asm fppack.asm fpsub.asm fpultof.asm fpupop1.asm fpupop2.asm isascii.asm isinf.asm isnan.asm log2.asm longjmp.asm memchr.asm memcmp.asm memcpy.asm memmove.asm memset.asm rand.asm round.asm sbrk.asm setjmp.asm sprintf.asm sqrtf.asm srand.asm stoi.asm strcasecmp.asm strcat.asm strchr.asm strcmp.asm strcpy.asm strcspn.asm strdup.asm strlen.asm strncasecmp.asm strncat.asm strncmp.asm strncpy.asm strndup.asm strnlen.asm strpbrk.asm strrchr.asm strspn.asm strstr.asm strtok.asm tolower.asm toupper.asm uldiv.asm
35-
36-
set HLP_C_SRC=
37-
set HLP_ASM_SRC=bdivs.asm bdivu.asm bldix.asm bldiy.asm bmuls.asm brems.asm bremu.asm bshl.asm bshrs.asm bshru.asm bstix.asm bstiy.asm case.asm case24.asm case24D.asm case16.asm case16D.asm case8.asm case8D.asm iand.asm idivs.asm idivu.asm ildix.asm ildiy.asm imulu.asm imuls.asm indcall.asm ineg.asm inot.asm ior.asm irems.asm iremu.asm ishl.asm ishrs.asm ishru.asm istix.asm istiy.asm itol.asm ixor.asm ladd.asm land.asm lcmpu.asm lcmps.asm ldivs.asm ldivu.asm lldix.asm lldiy.asm lmulu.asm lmuls.asm lneg.asm lnot.asm lor.asm lrems.asm lremu.asm lshl.asm lshrs.asm lshru.asm lstix.asm lstiy.asm lsub.asm lxor.asm sand.asm sdivs.asm sdivu.asm sldix.asm sldiy.asm smulu.asm sneg.asm snot.asm sor.asm srems.asm sremu.asm sshl.asm sshrs.asm sshru.asm sstix.asm sstiy.asm stoi.asm stoiu.asm sxor.asm frbmuls.asm frbtof.asm frftob.asm frftoi.asm frftos.asm frftoub.asm frftoui.asm frftous.asm frimuls.asm frimulu.asm fritof.asm frsmuls.asm frsmulu.asm frstof.asm frubtof.asm fruitof.asm frustof.asm frameset0.asm frameset.asm setflag.asm scmpzero.asm icmpzero.asm lcmpzero.asm seqcase.asm seqcaseD.asm
34+
call :setfiles RTL_SHARED_C_SRC %SHARED_PATH%\*.c
35+
call :setfiles RTL_SHARED_ASM_SRC %SHARED_PATH%\*.asm
3836

3937
set INT_C_SRC=
4038
set INT_ASM_SRC=interrupts.asm
@@ -89,12 +87,6 @@ set C_SRC=%USB_C_SRC%
8987
set ASM_SRC=%USB_ASM_SRC%
9088
call buildlib.bat cusbce.lib
9189

92-
echo -- Building CHLP libraries...
93-
set MY_PATH=%SHARED_PATH%
94-
set C_SRC=%HLP_C_SRC%
95-
set ASM_SRC=%HLP_ASM_SRC%
96-
call buildlib.bat chelp.lib
97-
9890
echo -- Building RTL...
9991
set MY_PATH=%SHARED_PATH%
10092
set C_SRC=%RTL_SHARED_C_SRC%
@@ -140,3 +132,9 @@ if exist *.lib del *.lib
140132
if exist *.obj del *.obj
141133

142134
pause
135+
goto :eof
136+
137+
:setfiles
138+
set %1=
139+
for %%a in (%2) do set %1=!%1! %%~nxa
140+
goto :eof

CEdev/lib/src/std/include/defines.h

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)