]> git.sur5r.net Git - cc65/commitdiff
Merge https://github.com/cc65/cc65 into c1p
authorStephan Mühlstrasser <stephan.muehlstrasser@web.de>
Sun, 2 Nov 2014 15:17:16 +0000 (16:17 +0100)
committerStephan Mühlstrasser <stephan.muehlstrasser@web.de>
Sun, 2 Nov 2014 15:17:16 +0000 (16:17 +0100)
1  2 
libsrc/Makefile
src/Makefile
src/ca65/main.c
src/cc65/main.c
src/common/target.c
src/common/target.h

diff --cc libsrc/Makefile
index 9955d6d77d3725e5752e7be96034cc3d27261f0f,6a801695a444f982bb478f03eefe151e3baeb948..b35ae1e382c171441999cbe96deadb11a471e7a9
@@@ -14,8 -18,8 +18,9 @@@ TARGETS = apple2    
            apple2enh \
            atari     \
            atarixl   \
+           atari5200 \
            atmos     \
 +          c1p       \
            $(CBMS)   \
            $(GEOS)   \
            lynx      \
diff --cc src/Makefile
index 4a80a78fbc553163d089fab8ef6dc08b3181d7ee,5aafc4bb8f4b9a44b5d65c531f116bda15679e09..34706fab57830b76d08c1b8446f29fcc4df68312
@@@ -1,7 -1,8 +1,9 @@@
- ifeq ($(shell echo),)
+ ifneq ($(shell echo),)
+   CMD_EXE = 1
+ endif
  
  PROGS = ar65  \
 +        c1p65 \
          ca65  \
          cc65  \
          cl65  \
diff --cc src/ca65/main.c
Simple merge
diff --cc src/cc65/main.c
Simple merge
Simple merge
Simple merge