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

diff --cc include/conio.h
index f8a880c7703ac1a47acaf56055217754aa2be9e7,10806785c87785ef29d5da9f5a9e97eab2f80685..8638e94d425b26ceaf4fab599eacc1204ee4e805
--- 1/include/conio.h
--- 2/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 dc944ee05b45ba9368d3289a70b38cb1c9f9cee5,42aaf078b8a936e211a9c71bb78ce4c286d1057f..d70ad5a3156251e6dfb935a976d7599bae3f8a62
--- 1/libsrc/Makefile
--- 2/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 4f39eb286744a6b28d139727580b9297f7ba2bb5,508f49603ed82eea736bad892f94be586e7cb936..d81a875778211560c3960f2179fdd4209197ac17
--- 1/src/ca65/main.c
--- 2/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 13fe76db490993bc40026821e90ad21f11b050e1,6b42c4db16bd755e36952c6ffbfe5697e03b933c..1041b8fa2df57d33019dd5b88ed2e5fb7eb432b5
--- 1/src/cc65/main.c
--- 2/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 013afe8ba2fe5c64c76f9811e35b8f8b9a8cf362,7e152fe945e10aa07e8159e1e9037fd75c77ea4c..60b9af6603c1f75d4d3751c6d2c6c8e08169f532
--- 1/src/common/target.c
--- 2/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     },

diff --cc src/common/target.h
Simple merge