Mercurial > hg > Members > kono > nitros9-code
changeset 2743:b44abaa5da88
Found that the lib folder was not being processed. Corrected issue.
| author | drencor-xeen |
|---|---|
| date | Tue, 08 Jan 2013 14:01:56 -0600 |
| parents | f9a8ae065f80 |
| children | 7a963a315d3e |
| files | ChangeLog level1/coco/cmds/makefile level1/modules/dw4read.asm makefile rules.mak |
| diffstat | 5 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 06 12:24:28 2013 -0600 +++ b/ChangeLog Tue Jan 08 14:01:56 2013 -0600 @@ -1,6 +1,18 @@ NitrOS-9 V3.2.9: ---------------------------------------------------------- +2013/01/08 David Ladd +M ChangeLog +M makefile +M rules.mak + +Found that primary makefile was not compiling files in the "lib" folder. +Created a NOSLIB label in rules.mak for the full path to "lib" folder. +Replaced the "lib" folder name that was in primary makefile to use +the NOSLIB label to correct the problem with the makefile not branching +into the "lib" folder to compile its files" + +---------------------------------------------------------- 2013/01/06 David Ladd M ChangeLog M level1/dalpha/makefile
--- a/level1/coco/cmds/makefile Sun Jan 06 12:24:28 2013 -0600 +++ b/level1/coco/cmds/makefile Tue Jan 08 14:01:56 2013 -0600 @@ -21,7 +21,7 @@ CMDS_D2 = basic09 runb gfx inkey syscall copy del echo format \ merge os9gen prompt tmode -CMDS_DW = inetd telnet dw +CMDS_DW = dw inetd telnet SUBS = gfx inkey syscall ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(SUBS)
--- a/level1/modules/dw4read.asm Sun Jan 06 12:24:28 2013 -0600 +++ b/level1/modules/dw4read.asm Tue Jan 08 14:01:56 2013 -0600 @@ -6,7 +6,7 @@ * Receive a response from the DriveWire server. * Times out if no data received within 1.3 (0.66) seconds. * -* THIS VERSION REQUIRES ONE OR MORE SYNC BYTES +* THIS VERSION REQUIRES ONE OR MORE SYNC BYTES * WHERE THE THE FINAL SYNC BYTE IS $C0 AND ANY * PRECEDING SYNC BYTES ARE $FF. * @@ -55,7 +55,7 @@ inca ; set CD FIRQ enable sta <$FF21 ; set new control state for PIA 1 stb <$FF23 - + * Wait for Sync Byte(s) or Timeout sync1 ldd #$0102 ; ACCA = serial in mask, ACCB = shift counter sync2 bita ,u ; sample input @@ -138,7 +138,7 @@ * Receive a response from the DriveWire server. * Times out if no data received within 1.3 (0.66) seconds. * -* THIS VERSION REQUIRES ONE OR MORE SYNC BYTES +* THIS VERSION REQUIRES ONE OR MORE SYNC BYTES * WHERE THE THE FINAL SYNC BYTE IS $C0 AND ANY * PRECEDING SYNC BYTES ARE $FF. *
--- a/makefile Sun Jan 06 12:24:28 2013 -0600 +++ b/makefile Tue Jan 08 14:01:56 2013 -0600 @@ -1,6 +1,6 @@ include $(NITROS9DIR)/rules.mak -dirs = lib $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY) +dirs = $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY) # Make all components all:
--- a/rules.mak Sun Jan 06 12:24:28 2013 -0600 +++ b/rules.mak Tue Jan 08 14:01:56 2013 -0600 @@ -98,6 +98,7 @@ LEVEL1 = $(NITROS9DIR)/level1 LEVEL2 = $(NITROS9DIR)/level2 LEVEL3 = $(NITROS9DIR)/level3 +NOSLIB = $(NITROS9DIR)/lib CC68L1 = $(LEVEL1)/coco CC368L2 = $(LEVEL2)/coco3 CC363L2 = $(LEVEL2)/coco3_6309