diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | emu/MacOSX/mkfile | 10 | ||||
| -rw-r--r-- | emu/MacOSX/mkfile-g | 13 | ||||
| -rw-r--r-- | emu/MacOSX/mkfile-x11 | 9 |
4 files changed, 8 insertions, 25 deletions
@@ -1,5 +1,6 @@ 20101205 change a few types in ipif-posix.c to appease the gods + emu/MacOSX/mkfile - include portmkfile at correct point for LIBFILES to work (and other, minor, changes) [issue 24] 20101127 emu/port/*ip*.[ch] and emu/Nt/ipif*.c updated with new interface for ipv6 support [mechiel] [issue 193] emu/Linux/os.c address compilation warnings (setfcr etc still to do) diff --git a/emu/MacOSX/mkfile b/emu/MacOSX/mkfile index 1b9237aa..9e8ea629 100644 --- a/emu/MacOSX/mkfile +++ b/emu/MacOSX/mkfile @@ -1,8 +1,6 @@ SYSTARG=MacOSX -#OBJTYPE=power <../../mkconfig SYSTARG=MacOSX -#OBJTYPE=power #Configurable parameters @@ -37,26 +35,22 @@ CFLAGS='-DROOT="'$ROOT'"'\ KERNDATE=`{$NDATE} -LDFLAGS=$LDFLAGS -L/usr/X11R6/lib - SYSLIBS= \ -lm\ -framework Carbon -framework QuickTime\ -lpthread\ -framework CoreFoundation\ -framework IOKit\ -# -framework ApplicationServices\ default:V: $O.$CONF +<../port/portmkfile $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES - $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS install:V: $O.$CONF cp $O.$CONF $INSTALLDIR/$CONF -<../port/portmkfile - devfs.c:N: ../port/devfs-posix.c diff --git a/emu/MacOSX/mkfile-g b/emu/MacOSX/mkfile-g index c1f9fa4b..c68ce703 100644 --- a/emu/MacOSX/mkfile-g +++ b/emu/MacOSX/mkfile-g @@ -1,12 +1,10 @@ SYSTARG=MacOSX -#OBJTYPE=power <../../mkconfig SYSTARG=MacOSX -#OBJTYPE=power #Configurable parameters -CONF=emu #default configuration +CONF=emu-g #default configuration CONFLIST=emu CLEANCONFLIST= @@ -37,26 +35,21 @@ CFLAGS='-DROOT="'$ROOT'"'\ KERNDATE=`{$NDATE} -LDFLAGS=$LDFLAGS -L/usr/X11R6/lib - SYSLIBS= \ -lm\ -lpthread\ -framework CoreFoundation\ -framework IOKit\ -# -framework ApplicationServices\ default:V: $O.$CONF +<../port/portmkfile $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES - $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS install:V: $O.$CONF cp $O.$CONF $INSTALLDIR/$CONF -<../port/portmkfile - -ipif.c:N: ../FreeBSD/ipif.c devfs.c:N: ../port/devfs-posix.c diff --git a/emu/MacOSX/mkfile-x11 b/emu/MacOSX/mkfile-x11 index 25fb99c6..1f6c407c 100644 --- a/emu/MacOSX/mkfile-x11 +++ b/emu/MacOSX/mkfile-x11 @@ -1,8 +1,6 @@ SYSTARG=MacOSX -#OBJTYPE=power <../../mkconfig SYSTARG=MacOSX -#OBJTYPE=power #Configurable parameters @@ -46,19 +44,16 @@ SYSLIBS= \ -lpthread\ -framework CoreFoundation\ -framework IOKit\ -# -framework ApplicationServices\ default:V: $O.$CONF +<../port/portmkfile $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES - $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS install:V: $O.$CONF cp $O.$CONF $INSTALLDIR/$CONF -<../port/portmkfile - -ipif.c:N: ../FreeBSD/ipif.c devfs.c:N: ../port/devfs-posix.c |