From: mrdudz <mrdudz@users.noreply.github.com>
Date: Sat, 11 Jul 2015 11:05:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into pcenginetarget
X-Git-Tag: V2.16~231^2~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=877fd532c28e0a23f3d0d7253c6936d056d3b3ce;p=cc65

Merge remote-tracking branch 'upstream/master' into pcenginetarget
---

877fd532c28e0a23f3d0d7253c6936d056d3b3ce
diff --cc include/conio.h
index f8a880c77,10806785c..8638e94d4
--- a/include/conio.h
+++ b/include/conio.h
@@@ -77,8 -77,8 +77,10 @@@
  #  include <lynx.h>
  #elif defined(__NES__)
  #  include <nes.h>
+ #elif defined(__OSIC1P__)
+ #  include <osic1p.h>
 +#elif defined(__PCE__)
 +#  include <pce.h>
  #endif
  
  
diff --cc libsrc/Makefile
index dc944ee05,42aaf078b..d70ad5a31
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -24,7 -24,7 +24,8 @@@ TARGETS = apple2    
            $(GEOS)   \
            lynx      \
            nes       \
+           osic1p    \
 +          pce       \
            sim6502   \
            sim65c02  \
            supervision
diff --cc src/ca65/main.c
index 4f39eb286,508f49603..d81a87577
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@@ -303,10 -303,10 +303,14 @@@ static void SetSys (const char* Sys
              NewSymbol ("__SIM65C02__", 1);
              break;
  
+         case TGT_OSIC1P:
+             NewSymbol ("__OSIC1P__", 1);
+             break;
+ 
 +        case TGT_PCENGINE:
 +            NewSymbol ("__PCE__", 1);
 +            break;
 +
          default:
              AbEnd ("Invalid target name: `%s'", Sys);
  
diff --cc src/cc65/main.c
index 13fe76db4,6b42c4db1..1041b8fa2
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@@ -258,10 -259,10 +259,14 @@@ static void SetSys (const char* Sys
              DefineNumericMacro ("__SIM65C02__", 1);
              break;
  
+         case TGT_OSIC1P:
+             DefineNumericMacro ("__OSIC1P__", 1);
+             break;
+ 
 +        case TGT_PCENGINE:
 +            DefineNumericMacro ("__PCE__", 1);
 +            break;
 +
          default:
              AbEnd ("Unknown target system type %d", Target);
      }
diff --cc src/common/target.c
index 013afe8ba,7e152fe94..60b9af660
--- a/src/common/target.c
+++ b/src/common/target.c
@@@ -142,7 -162,7 +162,8 @@@ static const TargetEntry TargetMap[] = 
      {   "module",       TGT_MODULE      },
      {   "nes",          TGT_NES         },
      {   "none",         TGT_NONE        },
+     {   "osic1p",       TGT_OSIC1P      },
 +    {   "pce",          TGT_PCENGINE    },
      {   "pet",          TGT_PET         },
      {   "plus4",        TGT_PLUS4       },
      {   "sim6502",      TGT_SIM6502     },