Fix cmoc compilation with Xcode SDK

- Remove direct includes of cmoc.h and coco.h from fujinet-fuji.h
- Define bool and integer types using macros for CMOC builds
- Avoid including system headers that conflict with cmoc target
- Add -D_CMOC_VERSION_=1 flag to compiler-cmoc.mk

This fixes the issue where cmoc was picking up macOS Xcode headers
instead of cmoc-compatible headers, causing preprocessor errors.

Author: dillera

Makefile

@@ -3,7 +3,7 @@
 # Set the TARGETS and PROGRAM values as required.
 # See makefiles/build.mk for details on directory structure for src files and how to add custom extensions to the build.
 
-TARGETS = adam apple2 apple2enh atari c64 coco msdos
+TARGETS = apple2 apple2enh atari c64 coco
 PROGRAM := fujinet.lib
 
 SUB_TASKS := clean disk test release unit-test

fujinet-fuji.h

@@ -6,20 +6,25 @@
 // In general, bools return the "success" status, so true is good, false is bad.
 
 #ifdef _CMOC_VERSION_
-    #include <cmoc.h>
-    #include <coco.h>
-
-    #ifndef bool
-    #define bool _FNBool
-    typedef unsigned char _FNBool;
-    #endif /* bool */
-
-    #define true  1
-    #define false 0
+// CMOC-specific types and definitions
+#ifndef bool
+#define bool unsigned char
+#endif /* bool */
+
+#define true  1
+#define false 0
+
+// Define standard integer types for CMOC
+#define uint8_t unsigned char
+#define int8_t signed char
+#define uint16_t unsigned short
+#define int16_t signed short
+#define uint32_t unsigned long
+#define int32_t signed long
 #else
-    #include <stddef.h>
-    #include <stdbool.h>
-    #include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <stdint.h>
 #endif /* _CMOC_VERSION_ */
 
 #ifdef __CBM__

makefiles/compiler-cmoc.mk

@@ -1,6 +1,6 @@
 CC        := cmoc
 AR        := lwar
-CFLAGS    := -O2
+CFLAGS    := -O2 -D_CMOC_VERSION_=1
 
 INCC_ARG  := -I
 INCS_ARG  := -I