From: Stephan Mühlstrasser <stephan.muehlstrasser@web.de>
Date: Sun, 2 Nov 2014 15:17:16 +0000 (+0100)
Subject: Merge https://github.com/cc65/cc65 into c1p
X-Git-Tag: V2.15~22^2~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b186407f1117529f0f6902569f9d24bc8b1b979;p=cc65

Merge https://github.com/cc65/cc65 into c1p
---

0b186407f1117529f0f6902569f9d24bc8b1b979
diff --cc libsrc/Makefile
index 9955d6d77,6a801695a..b35ae1e38
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -14,8 -18,8 +18,9 @@@ TARGETS = apple2    
            apple2enh \
            atari     \
            atarixl   \
+           atari5200 \
            atmos     \
 +          c1p       \
            $(CBMS)   \
            $(GEOS)   \
            lynx      \
diff --cc src/Makefile
index 4a80a78fb,5aafc4bb8..34706fab5
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1,7 -1,8 +1,9 @@@
- ifeq ($(shell echo),)
+ ifneq ($(shell echo),)
+   CMD_EXE = 1
+ endif
  
  PROGS = ar65  \
 +        c1p65 \
          ca65  \
          cc65  \
          cl65  \