+2008-02-16 Maarten Brock <sourceforge.brock AT dse.nl>
+
+ * as/link/mcs51/aslink.dsp: removed SDK define
+ * as/link/z80/clean.mk: brought in sync with other ports
+ * as/link/z80/lklibr.c (SdccLib, fndsym): handle the dflag here too
+ * as/hc08/Makefile.bcc,
+ * as/mcs51/Makefile.bcc,
+ * as/z80/Makefile.bcc: noice.c was moved to as/asxxsrc/
+ * src/z80/main.c (_setValues): use the now capitalized -Z,
+ (z80_port, gbz80_port): generate debug information when asked
+
2008-02-16 Borut Razem <borut.razem AT siol.net>
* as/z80/asmain.c, as/z80/asm.h, as/z80/asdata.c,
as/link/z80/lkmain.c, as/z80/as_gbz80.dsp, as/z80/as_z80.dsp,
- as/z80/Makefile.in. as/z80/Makefile.bcc:
+ as/z80/Makefile.in. as/z80/Makefile.bcc:
applied patch #1893393: patch for as-z80 and link-z80 to generate
cdb, thanks to Armin Diehl
* as/*/asnoice.c, as/hc08/as_hc08.dsp, as/hc08/Makefile.in,
!include $(PRJDIR)/Bcc.inc
-ASOBJECTS = asmain.obj aslex.obj assubr.obj asnoice.obj \
+ASOBJECTS = asmain.obj aslex.obj assubr.obj \
asexpr.obj asdata.obj aslist.obj asout.obj \
h08ext.obj h08pst.obj h08mch.obj h08adr.obj \
../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj \
+ ../asxxsrc/asnoice.obj \
../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
ASX8051 = $(PRJDIR)/bin/asx8051.exe
# PROP Intermediate_Dir "Debug"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FR /FD /GZ /c\r
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FR /FD /GZ /c\r
# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
# ADD RSC /l 0x409 /d "_DEBUG"\r
# PROP Intermediate_Dir "Release"\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FD /c\r
# ADD CPP /nologo /W3 /GX /O2 /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FD /c\r
# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
# ADD RSC /l 0x409 /d "NDEBUG"\r
clean:
rm -f *core *[%~] *.[oa]
rm -f .[a-z]*~
- rm -f $(top_builddir)/bin/link-z80$(EXEEXT) link-z80$(EXEEXT) \
- $(top_builddir)/bin/link-gbz80$(EXEEXT) link-gbz80$(EXEEXT)
- rm -f *.dep
+ rm -f $(top_builddir)/bin/link-z80$(EXEEXT) link-z80$(EXEEXT)
+ rm -f $(top_builddir)/bin/link-gbz80$(EXEEXT) link-gbz80$(EXEEXT)
rm -rf obj
# Deleting all files created by configuring or building the program
# -----------------------------------------------------------------
distclean: clean
- rm -f Makefile
+ rm -f Makefile *.dep
# Like clean but some files may still exist
# -----------------------------------------
fseek(libfp, lbfh->offset, SEEK_SET);
LoadRel(PathLib, libfp, ModName);
+ /* if cdb information required & .adb file present */
+ if (dflag && dfp)
+ {
+ if(LoadAdb(libfp))
+ SaveLinkedFilePath(DirLib);
+ }
return 1; /*Found the symbol, so success!*/
}
}
}
else
{ /*For a stand alone object file*/
+ /* if cdb information required & adb file present */
+ if (dflag && dfp)
+ {
+ FILE *xfp = afile(lbfh->filspc, "adb",0);
+ if (xfp)
+ {
+ SaveLinkedFilePath(lbfh->filspc);
+ copyfile(dfp, xfp);
+ fclose(xfp);
+ }
+ }
loadfile(lbfh->filspc);
}
ThisLibr->loaded=1;
}
This->next = NULL;
This->loaded=-1;
- This->offset=-1; /*There should be a rel file*/
+ This->offset=-1; /*We have a stand alone .rel file*/
This->libspc = lbnh->libspc;
This->relfil=(char *)new(strlen(relfil)+1);
strcpy(lbfh->relfil,relfil);
fclose(fp);
fclose(libfp);
+
+ /* if cdb information required & adb file present */
+ if (dflag && dfp)
+ {
+ FILE *xfp = afile(str,"adb",0); //JCF: Nov 30, 2002
+ if (xfp)
+ {
+ SaveLinkedFilePath(str);
+ copyfile(dfp,xfp);
+ fclose(xfp);
+ }
+ }
loadfile(str);
return (1);
}
!include $(PRJDIR)/Bcc.inc
-ASOBJECTS = asmain.obj aslex.obj assubr.obj asnoice.obj \
+ASOBJECTS = asmain.obj aslex.obj assubr.obj \
asexpr.obj asdata.obj aslist.obj asout.obj \
i51ext.obj i51pst.obj i51mch.obj i51adr.obj \
../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj \
+ ../asxxsrc/asnoice.obj \
../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
ASX8051 = $(PRJDIR)/bin/asx8051.exe
CFLAGS = $(CFLAGS) -DINDEXLIB -DMLH_MAP -DSDK
-OBJECTS = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \
- asout.obj assubr.obj z80adr.obj z80ext.obj asnoice.obj \
- z80mch.obj z80pst.obj \
- ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj ../asxxsrc/aslex.obj \
- ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
+OBJECTS = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \
+ asout.obj assubr.obj z80adr.obj z80ext.obj \
+ z80mch.obj z80pst.obj \
+ ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj ../asxxsrc/aslex.obj \
+ ../asxxsrc/asnoice.obj \
+ ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
-TARGET = $(PRJDIR)/bin/as-z80.exe
+TARGET = $(PRJDIR)/bin/as-z80.exe
all: $(TARGET)
if (IS_GB)
{
- setMainValue ("z80outputtypeflag", "-z");
+ setMainValue ("z80outputtypeflag", "-Z");
setMainValue ("z80outext", ".gb");
}
else
{
NULL,
ASMCMD,
- "-plosgff", /* Options with debug */
+ "-plosgffc", /* Options with debug */
"-plosgff", /* Options without debug */
0,
".asm"
{
NULL,
ASMCMD,
- "-plosgff", /* Options with debug */
+ "-plosgffc", /* Options with debug */
"-plosgff", /* Options without debug */
0,
".asm",