diff -r -c orig/prc-tools-0.4.3a3/build-prc.c prc-tools-0.4.3a3/build-prc.c
*** orig/prc-tools-0.4.3a3/build-prc.c	Mon Jun 02 16:48:56 1997
--- prc-tools-0.4.3a3/build-prc.c	Tue Jun 24 11:02:42 1997
***************
*** 7,16 ****
  #include <unistd.h>
  #include <stdio.h>
  #include <fcntl.h>
  #include <malloc.h>
  #include "prc.h"
  
! #ifdef CYGWIN32
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
--- 7,20 ----
  #include <unistd.h>
  #include <stdio.h>
  #include <fcntl.h>
+ #ifdef __CYGWIN32__
+ #include <stdlib.h>
+ #else
  #include <malloc.h>
+ #endif
  #include "prc.h"
  
! #ifdef __CYGWIN32__
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
***************
*** 26,38 ****
--- 30,50 ----
    int slen;
    int opt;
    char *type = "appl";
+ #ifdef __CYGWIN32__
+   int optind = 1;
+ #endif
  
    if (argc < 5) {
      fprintf(stderr, "Usage: %s [-Ll] fname.prc 'App Name' apid resource resource ...\n", argv[0]);
      exit (1);
    }
  
+ #ifdef __CYGWIN32__
+   while (optind < argc && argv[optind][0] == '-') {
+     opt = argv[optind++][1];
+ #else
    while ((opt = getopt(argc, argv, "lL")) != -1) {
+ #endif
      switch (opt) {
  
      case 'l':
diff -r -c orig/prc-tools-0.4.3a3/emit-prc.c prc-tools-0.4.3a3/emit-prc.c
*** orig/prc-tools-0.4.3a3/emit-prc.c	Mon Jun 02 15:54:28 1997
--- prc-tools-0.4.3a3/emit-prc.c	Tue Jun 24 11:02:42 1997
***************
*** 4,17 ****
   * This is Free Software, under the GNU Public Licence v2 or greater.
   */
  
  #include <malloc.h>
  #include <string.h>
  #include <fcntl.h>
  #include <sys/types.h>
  #include <netinet/in.h>
  #include "prc.h"
  
! #ifdef CYGWIN32
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
--- 4,21 ----
   * This is Free Software, under the GNU Public Licence v2 or greater.
   */
  
+ #ifdef __CYGWIN32__
+ #include <stdlib.h>
+ #else
  #include <malloc.h>
+ #endif
  #include <string.h>
  #include <fcntl.h>
  #include <sys/types.h>
  #include <netinet/in.h>
  #include "prc.h"
  
! #ifdef __CYGWIN32__
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
diff -r -c orig/prc-tools-0.4.3a3/Makefile prc-tools-0.4.3a3/Makefile
*** orig/prc-tools-0.4.3a3/Makefile	Tue Jun 17 06:04:34 1997
--- prc-tools-0.4.3a3/Makefile	Wed Jun 25 08:24:40 1997
***************
*** 2,8 ****
  CFLAGS = -O2 -g
  # -g -DDEBUG
  
! PREFIX = /home/jeff/pilot-tst
  TOOLDIR = $(PREFIX)/bin
  
  TTY = /dev/cua0
--- 2,8 ----
  CFLAGS = -O2 -g
  # -g -DDEBUG
  
! PREFIX = /usr/local
  TOOLDIR = $(PREFIX)/bin
  
  TTY = /dev/cua0
***************
*** 19,45 ****
  
  PILRCDIR = pilrc1.5
  
  .EXPORT_ALL_VARIABLES:
  
  all: gdbpanel/gdbpanel.prc example/pilrctst.prc
  
  install: all dummy install-man
! 	cd $(LIBCDIR) ; make install
! 	cd $(LIBMDIR) ; make install
! 	cd $(LIBGLIBDIR) ; make install
! 	cp -f pilrc $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f txt2bitm $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f obj-res $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f build-prc $(PREFIX)/m68k-palmos-coff/bin
  	cp -f stubgen $(PREFIX)/m68k-palmos-coff/bin
  	cp -f exportlist $(PREFIX)/m68k-palmos-coff/bin
! 	cp -raf PalmOS1 $(PREFIX)/m68k-palmos-coff
! 	cp -raf PalmOS2 $(PREFIX)/m68k-palmos-coff
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/pilrc $(PREFIX)/bin/pilrc
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/txt2bitm $(PREFIX)/bin/txt2bitm
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/obj-res $(PREFIX)/bin/m68k-palmos-coff-obj-res
  	ln -sf $(PREFIX)/m68k-palmos-coff/bin/exportlist $(PREFIX)/bin/m68k-palmos-coff-exportlist
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/build-prc $(PREFIX)/bin/build-prc
  	ln -sf $(PREFIX)/m68k-palmos-coff/bin/stubgen $(PREFIX)/bin/m68k-palmos-coff-stubgen
  
  install-man: dummy
--- 19,51 ----
  
  PILRCDIR = pilrc1.5
  
+ EXEEXT = .exe
+ 
  .EXPORT_ALL_VARIABLES:
  
+ # export doesn't work on make in gnuwin32 b18...
+ MAKEEXPORTS = PREFIX=$(PREFIX) TOOLDIR=$(TOOLDIR) \
+ 	LIBCDIR=$(LIBCDIR) LIBMDIR=$(LIBMDIR) LIBGLIBDIR=$(LIBGLIBDIR)
+ 
  all: gdbpanel/gdbpanel.prc example/pilrctst.prc
  
  install: all dummy install-man
! 	cd $(LIBCDIR) ; make $(MAKEEXPORTS) install
! 	cd $(LIBMDIR) ; make $(MAKEEXPORTS) install
! 	cd $(LIBGLIBDIR) ; make $(MAKEEXPORTS) install
! 	cp -f pilrc$(EXEEXT) $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f txt2bitm$(EXEEXT) $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f obj-res$(EXEEXT) $(PREFIX)/m68k-palmos-coff/bin
! 	cp -f build-prc$(EXEEXT) $(PREFIX)/m68k-palmos-coff/bin
  	cp -f stubgen $(PREFIX)/m68k-palmos-coff/bin
  	cp -f exportlist $(PREFIX)/m68k-palmos-coff/bin
! 	-cp -raf PalmOS1 $(PREFIX)/m68k-palmos-coff
! 	-cp -raf PalmOS2 $(PREFIX)/m68k-palmos-coff
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/pilrc$(EXEEXT) $(PREFIX)/bin/pilrc$(EXEEXT)
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/txt2bitm$(EXEEXT) $(PREFIX)/bin/txt2bitm$(EXEEXT)
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/obj-res$(EXEEXT) $(PREFIX)/bin/m68k-palmos-coff-obj-res$(EXEEXT)
  	ln -sf $(PREFIX)/m68k-palmos-coff/bin/exportlist $(PREFIX)/bin/m68k-palmos-coff-exportlist
! 	ln -sf $(PREFIX)/m68k-palmos-coff/bin/build-prc$(EXEEXT) $(PREFIX)/bin/build-prc$(EXEEXT)
  	ln -sf $(PREFIX)/m68k-palmos-coff/bin/stubgen $(PREFIX)/bin/m68k-palmos-coff-stubgen
  
  install-man: dummy
***************
*** 62,68 ****
  	cd $(PILRCDIR) ; make
  
  pilrc: $(PILRCDIR)/pilrc
! 	mv $(PILRCDIR)/pilrc .
  
  exportlist: dummy
  	echo \#!/bin/sh > $@
--- 68,74 ----
  	cd $(PILRCDIR) ; make
  
  pilrc: $(PILRCDIR)/pilrc
! 	mv $(PILRCDIR)/pilrc$(EXEEXT) .
  
  exportlist: dummy
  	echo \#!/bin/sh > $@
***************
*** 72,95 ****
  	chmod +x $@
  
  gdbpanel/gdbpanel.prc: dummy pilrc build-prc obj-res txt2bitm libc.a libm.a libGLib.a
! 	cd gdbpanel ; make
  
  example/pilrctst.prc: dummy pilrc build-prc obj-res txt2bitm libc.a libm.a libGLib.a
! 	cd example ; make
  
  libc.a: dummy exportlist obj-res build-prc libGLib.a
! 	cd $(LIBCDIR) ; make
  	ln -sf $(LIBCDIR)/libc.a libc.a
  	ln -sf $(LIBCDIR)/libc.a libg.a
  	ln -sf $(LIBCDIR)/libc.sa libc.sa
  	ln -sf $(LIBCDIR)/libc.sa libg.sa
  
  libm.a: dummy exportlist obj-res build-prc
! 	cd $(LIBMDIR) ; make
  	ln -sf $(LIBMDIR)/libmf.a libm.a
  
  libGLib.a: dummy obj-res build-prc
! 	cd $(LIBGLIBDIR) ; make
  
  dummy:
  
--- 78,101 ----
  	chmod +x $@
  
  gdbpanel/gdbpanel.prc: dummy pilrc build-prc obj-res txt2bitm libc.a libm.a libGLib.a
! 	cd gdbpanel ; make $(MAKEEXPORTS)
  
  example/pilrctst.prc: dummy pilrc build-prc obj-res txt2bitm libc.a libm.a libGLib.a
! 	cd example ; make $(MAKEEXPORTS)
  
  libc.a: dummy exportlist obj-res build-prc libGLib.a
! 	cd $(LIBCDIR) ; make $(MAKEEXPORTS)
  	ln -sf $(LIBCDIR)/libc.a libc.a
  	ln -sf $(LIBCDIR)/libc.a libg.a
  	ln -sf $(LIBCDIR)/libc.sa libc.sa
  	ln -sf $(LIBCDIR)/libc.sa libg.sa
  
  libm.a: dummy exportlist obj-res build-prc
! 	cd $(LIBMDIR) ; make $(MAKEEXPORTS)
  	ln -sf $(LIBMDIR)/libmf.a libm.a
  
  libGLib.a: dummy obj-res build-prc
! 	cd $(LIBGLIBDIR) ; make $(MAKEEXPORTS)
  
  dummy:
  
diff -r -c orig/prc-tools-0.4.3a3/obj-res.c prc-tools-0.4.3a3/obj-res.c
*** orig/prc-tools-0.4.3a3/obj-res.c	Tue Jun 17 05:45:36 1997
--- prc-tools-0.4.3a3/obj-res.c	Tue Jun 24 11:02:42 1997
***************
*** 11,17 ****
--- 11,21 ----
  
  #include <stdio.h>
  #include <fcntl.h>
+ #ifdef __CYGWIN32__
+ #include <stdlib.h>
+ #else
  #include <malloc.h>
+ #endif
  #include <sys/types.h>
  #include <netinet/in.h>
  
***************
*** 22,28 ****
  #include <bfd.h>
  #include "prc.h"
  
! #ifdef CYGWIN32
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
--- 26,32 ----
  #include <bfd.h>
  #include "prc.h"
  
! #ifdef __CYGWIN32__
  #define O_PLATFORM O_BINARY
  #else
  #define O_PLATFORM 0
***************
*** 268,274 ****
--- 272,282 ----
  
    asection *text_section = bfd_get_section_by_name (abfd, ".text");
  
+ #ifdef __CYGWIN32__
+   if (!(ef = fopen(ename, "rb"))) {
+ #else
    if (!(ef = fopen(ename, "r"))) {
+ #endif
      fprintf (stderr,"Can't open %s\n",ename);
      exit(1);
    }
diff -r -c orig/prc-tools-0.4.3a3/pilrc1.5/bitmap.c prc-tools-0.4.3a3/pilrc1.5/bitmap.c
*** orig/prc-tools-0.4.3a3/pilrc1.5/bitmap.c	Tue Jun 17 04:50:34 1997
--- prc-tools-0.4.3a3/pilrc1.5/bitmap.c	Wed Jun 25 08:11:06 1997
***************
*** 69,78 ****
--- 69,88 ----
  typedef struct tagBITMAPFILEHEADER 
  	{ /* bmfh */
  	ushort  bfType; 
+ #ifdef __GNUC__
+ 	ushort  bfSize1; 
+ 	ushort  bfSize2; 
+ #else
  	ulong   bfSize; 
+ #endif
  	ushort  bfReserved1; 
  	ushort  bfReserved2; 
+ #ifdef __GNUC__
+ 	ushort  bfOffBits1; 
+ 	ushort  bfOffBits2; 
+ #else
  	ulong   bfOffBits; 
+ #endif
  	} BITMAPFILEHEADER; 
   
  
diff -r -c orig/prc-tools-0.4.3a3/pilrc1.5/util.c prc-tools-0.4.3a3/pilrc1.5/util.c
*** orig/prc-tools-0.4.3a3/pilrc1.5/util.c	Tue Jun 17 04:50:34 1997
--- prc-tools-0.4.3a3/pilrc1.5/util.c	Tue Jun 24 11:02:44 1997
***************
*** 561,567 ****
  
  		    sprintf( szFullName, "%s\\%s", includePaths[i], szIn);
  		
! 		    file = fopen( szFullName, "rt");
  		    if ( file != NULL )
  			{
  			    break;
--- 561,567 ----
  
  		    sprintf( szFullName, "%s\\%s", includePaths[i], szIn);
  		
! 		    file = fopen( szFullName, mode);
  		    if ( file != NULL )
  			{
  			    break;