From a459416b8ccfbc72b21ea4053f68bf2c69a747e2 Mon Sep 17 00:00:00 2001 From: michaelh Date: Tue, 25 Sep 2001 03:43:34 +0000 Subject: [PATCH] Minor changes to fix up path seperators. git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1307 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- src/SDCCmain.c | 7 +++++-- src/z80/main.c | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 058f5215..3573c6bb 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -233,9 +233,13 @@ unsupportedOptTable[] = { { 'Y', NULL, "use -I instead" } }; +/** List of all default constant macros. + */ static const char *_baseValues[] = { - "cpp", "{bindir}/sdcpp", + "cpp", "{bindir}{sep}sdcpp", "cppextraopts", "", + /* Path seperator character */ + "sep", DIR_SEPARATOR_STRING, NULL }; @@ -1163,7 +1167,6 @@ linkEdit (char **envp) } else { - printf("Here 1\n"); buildCmdLine2 (buffer, port->linker.mcmd); } diff --git a/src/z80/main.c b/src/z80/main.c index 2a07616f..2cddd076 100644 --- a/src/z80/main.c +++ b/src/z80/main.c @@ -271,8 +271,8 @@ _setValues(void) { if (options.nostdlib == FALSE) { - setMainValue ("z80libspec", "-k{libdir}/{port} -l{port}.lib"); - setMainValue ("z80crt0", "{libdir}/{port}/crt0{objext}"); + setMainValue ("z80libspec", "-k{libdir}{sep}{port} -l{port}.lib"); + setMainValue ("z80crt0", "{libdir}{sep}{port}{sep}crt0{objext}"); } else { @@ -387,7 +387,7 @@ _getRegName (struct regs *reg) } #define LINKCMD \ - "{bindir}/link-{port} -n -c -- {z80bases} -m -j" \ + "{bindir}{sep}link-{port} -n -c -- {z80bases} -m -j" \ " {z80libspec}" \ " {z80extralibfiles} {z80extralibpaths}" \ " {z80outputtypeflag} {srcfilename}{z80outext}" \ @@ -396,7 +396,7 @@ _getRegName (struct regs *reg) " {z80extraobj}" #define ASMCMD \ - "{bindir}/as-{port} -plosgff {srcfilename}{objext} {srcfilename}{asmext}" + "{bindir}{sep}as-{port} -plosgff {srcfilename}{objext} {srcfilename}{asmext}" /* Globals */ PORT z80_port = -- 2.30.2