Index: src/af/ev/mac/Makefile
===================================================================
RCS file: /u2/cvsroot/abi/src/af/ev/mac/Makefile,v
retrieving revision 1.3
diff -c -r1.3 Makefile
*** src/af/ev/mac/Makefile	1999/05/23 19:13:05	1.3
--- src/af/ev/mac/Makefile	2000/08/16 09:13:20
***************
*** 22,32 ****
  
  include $(ABI_ROOT)/src/config/abi_defs.mk
  
! CPPSRCS=		ev_Win32Keyboard.cpp		\
! 			ev_Win32Menu.cpp		\
! 			ev_Win32Mouse.cpp		\
! 			ev_Win32Toolbar.cpp		\
! 			ev_Win32Toolbar_ViewListener.cpp
  
  TARGETS=		$(OBJS)
  
--- 22,32 ----
  
  include $(ABI_ROOT)/src/config/abi_defs.mk
  
! CPPSRCS=		ev_MacKeyboard.cpp		\
! 			ev_MacMenu.cpp		\
! 			ev_MacMouse.cpp		\
! 			ev_MacToolbar.cpp		\
! 			ev_MacTlbr_ViewListener.cpp
  
  TARGETS=		$(OBJS)
  
Index: src/af/ev/mac/ev_MacMenu.h
===================================================================
RCS file: /u2/cvsroot/abi/src/af/ev/mac/ev_MacMenu.h,v
retrieving revision 1.2
diff -c -r1.2 ev_MacMenu.h
*** src/af/ev/mac/ev_MacMenu.h	1999/03/14 19:20:27	1.2
--- src/af/ev/mac/ev_MacMenu.h	2000/08/16 09:13:20
***************
*** 20,25 ****
--- 20,29 ----
  #ifndef EV_MACMENU_H
  #define EV_MACMENU_H
  
+ // Mac includes
+ #include <Menus.h>
+ #include <ToolUtils.h>
+ 
  #include "ut_types.h"
  #include "xap_Types.h"
  #include "ev_Menu.h"
Index: src/af/ev/mac/ev_MacMouse.h
===================================================================
RCS file: /u2/cvsroot/abi/src/af/ev/mac/ev_MacMouse.h,v
retrieving revision 1.1
diff -c -r1.1 ev_MacMouse.h
*** src/af/ev/mac/ev_MacMouse.h	1999/03/11 04:58:33	1.1
--- src/af/ev/mac/ev_MacMouse.h	2000/08/16 09:13:20
***************
*** 23,28 ****
--- 23,30 ----
  #ifndef EV_MACMOUSE_H
  #define EV_MACMOUSE_H
  
+ #include <MacWindows.h>
+ 
  #include "ev_Mouse.h"
  #include "ev_EditBits.h"
  
Index: src/af/ev/mac/ev_MacToolbar.h
===================================================================
RCS file: /u2/cvsroot/abi/src/af/ev/mac/ev_MacToolbar.h,v
retrieving revision 1.4
diff -c -r1.4 ev_MacToolbar.h
*** src/af/ev/mac/ev_MacToolbar.h	2000/03/02 00:16:15	1.4
--- src/af/ev/mac/ev_MacToolbar.h	2000/08/16 09:13:20
***************
*** 20,25 ****
--- 20,27 ----
  #ifndef EV_MACTOOLBAR_H
  #define EV_MACTOOLBAR_H
  
+ #include <MacWindows.h>
+ 
  #include "ut_types.h"
  #include "ut_vector.h"
  #include "xap_Types.h"
Index: src/af/gr/mac/Makefile
===================================================================
RCS file: /u2/cvsroot/abi/src/af/gr/mac/Makefile,v
retrieving revision 1.5
diff -c -r1.5 Makefile
*** src/af/gr/mac/Makefile	1999/05/23 19:13:11	1.5
--- src/af/gr/mac/Makefile	2000/08/16 09:13:20
***************
*** 22,28 ****
  
  include $(ABI_ROOT)/src/config/abi_defs.mk
  
! CPPSRCS=		gr_Win32Graphics.cpp
  
  TARGETS=		$(OBJS)
  
--- 22,28 ----
  
  include $(ABI_ROOT)/src/config/abi_defs.mk
  
! CPPSRCS=		gr_MacGraphics.cpp
  
  TARGETS=		$(OBJS)
  
Index: src/config/platforms/macosx.mk
===================================================================
RCS file: /u2/cvsroot/abi/src/config/platforms/macosx.mk,v
retrieving revision 1.1
diff -c -r1.1 macosx.mk
*** src/config/platforms/macosx.mk	2000/08/03 21:18:00	1.1
--- src/config/platforms/macosx.mk	2000/08/16 09:13:20
***************
*** 61,71 ****
  endif
  
  # Includes
! OS_INCLUDES		= -I/usr/local/include
  G++INCLUDES		= -I/usr/include/g++
  
  # Compiler flags
! PLATFORM_FLAGS		= -DNO_SYS_ERRLIST
  #PORT_FLAGS		= -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -D_XOPEN_SOURCE -D__USE_XOPEN_EXTENDED
  OS_CFLAGS		= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
  
--- 61,71 ----
  endif
  
  # Includes
! OS_INCLUDES		= -I/usr/local/include -I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers
  G++INCLUDES		= -I/usr/include/g++
  
  # Compiler flags
! PLATFORM_FLAGS		= -DNO_SYS_ERRLIST $(OS_INCLUDES)
  #PORT_FLAGS		= -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR -D_XOPEN_SOURCE -D__USE_XOPEN_EXTENDED
  OS_CFLAGS		= $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS)
  
***************
*** 84,91 ****
  #MKSHLIB		= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
  MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
  
! ABI_NATIVE	= macosx
! ABI_FE		= macosx
  
  ##################################################################
  ## ABIPKGDIR defines the directory containing the Makefile to use to
--- 84,91 ----
  #MKSHLIB		= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
  MKSHLIB			= $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so)
  
! ABI_NATIVE	= mac
! ABI_FE		= Mac
  
  ##################################################################
  ## ABIPKGDIR defines the directory containing the Makefile to use to