Minor changes to fix up path seperators.
authormichaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Tue, 25 Sep 2001 03:43:34 +0000 (03:43 +0000)
committermichaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Tue, 25 Sep 2001 03:43:34 +0000 (03:43 +0000)
git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1307 4a8a32a2-be11-0410-ad9d-d568d2c75423

src/SDCCmain.c
src/z80/main.c

index 058f521507dcd657a21a1fa978809e39bd9f9c3a..3573c6bb7aafb34d3ee83421bb5f0dd6311bb7cb 100644 (file)
@@ -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);
     }
 
index 2a07616fed1889d6e2e66b19d9f6adbac28c6ce0..2cddd076d16de916d384f9dad16093a021e5727b 100644 (file)
@@ -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 =