Mercurial > hg > Members > kono > nitros9-code

changeset 2769:863cf7feafa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Robert Gault found a problem related to MinGW not building the level2/coco3_6309/cmds/makefile correctly. Changed the way the makefile does its include from level2/coco3/cmds/makefile_common as well as updated level2/coco3/cmds/makefile to use the same include line.
author drencor-xeen
date Fri, 18 Jan 2013 21:52:41 -0600
parents 57b3108c144d
children 8b2df903334c
files ChangeLog level2/coco3/cmds/makefile level2/coco3_6309/cmds/makefile
diffstat 3 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 17 21:45:46 2013 -0600
+++ b/ChangeLog	Fri Jan 18 21:52:41 2013 -0600
@@ -1,6 +1,20 @@
 NitrOS-9 V3.2.9:
 
 ----------------------------------------------------------
+2013/01/18 David Ladd
+M ChangeLog
+M level2/coco3/cmds/makefile
+M level2/coco3_6309/cmds/makefile
+
+Robert Gault found a problem with building the NitrOS-9
+project from MinGW related to the level2/coco3_6309/cmds/
+makefile not including level2/coco3/cmds/makefile_common
+correctly.  Changed the include line to use $(CC368L2)/cmds/
+makefile_common in both level2/coco3/cmds/makefile and
+level2/coco3_6309/cmds/makefile .  This should help with
+this problem.
+
+----------------------------------------------------------
 2013/01/17 David Ladd
 M ChangeLog
 M 3rdparty/packages/pacos9/makefile
--- a/level2/coco3/cmds/makefile	Thu Jan 17 21:45:46 2013 -0600
+++ b/level2/coco3/cmds/makefile	Fri Jan 18 21:52:41 2013 -0600
@@ -2,5 +2,5 @@
 NITROS9DIR      = $(HOME)/nitros9
 endif
 include $(NITROS9DIR)/rules.mak
-include makefile_common
+include $(CC368L2)/cmds/makefile_common
 LFLAGS          += -l=$(NITROS9DIR)/lib/sys6809l2.l
--- a/level2/coco3_6309/cmds/makefile	Thu Jan 17 21:45:46 2013 -0600
+++ b/level2/coco3_6309/cmds/makefile	Fri Jan 18 21:52:41 2013 -0600
@@ -2,6 +2,6 @@
 NITROS9DIR      = $(HOME)/nitros9
 endif
 include $(NITROS9DIR)/rules.mak
-include ../../coco3/cmds/makefile_common
+include $(CC368L2)/cmds/makefile_common
 AFLAGS          += -e -aH6309=1
 LFLAGS		+= -l=$(NITROS9DIR)/lib/sys6309l2.l