Unified · Split
| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | 20101205 |
| 2 | 2 | change a few types in ipif-posix.c to appease the gods |
| 3 | + emu/MacOSX/mkfile - include portmkfile at correct point for LIBFILES to work (and other, minor, changes) [issue 24] | |
| 3 | 4 | 20101127 |
| 4 | 5 | emu/port/*ip*.[ch] and emu/Nt/ipif*.c updated with new interface for ipv6 support [mechiel] [issue 193] |
| 5 | 6 | emu/Linux/os.c address compilation warnings (setfcr etc still to do) |
| @@ -1,8 +1,6 @@ | ||
| 1 | 1 | SYSTARG=MacOSX |
| 2 | −#OBJTYPE=power | |
| 3 | 2 | <../../mkconfig |
| 4 | 3 | SYSTARG=MacOSX |
| 5 | −#OBJTYPE=power | |
| 6 | 4 | |
| 7 | 5 | #Configurable parameters |
| 8 | 6 | |
| @@ -37,26 +35,22 @@ CFLAGS='-DROOT="'$ROOT'"'\ · 28 unmodified lines | ||
| 37 | 35 | |
| 38 | 36 | KERNDATE=`{$NDATE} |
| 39 | 37 | |
| 40 | −LDFLAGS=$LDFLAGS -L/usr/X11R6/lib | |
| 41 | − | |
| 42 | 38 | SYSLIBS= \ |
| 43 | 39 | -lm\ |
| 44 | 40 | -framework Carbon -framework QuickTime\ |
| 45 | 41 | -lpthread\ |
| 46 | 42 | -framework CoreFoundation\ |
| 47 | 43 | -framework IOKit\ |
| 48 | −# -framework ApplicationServices\ | |
| 49 | 44 | |
| 50 | 45 | default:V: $O.$CONF |
| 51 | 46 | |
| 47 | +<../port/portmkfile | |
| 52 | 48 | |
| 53 | 49 | $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES |
| 54 | − $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c | |
| 50 | + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c | |
| 55 | 51 | $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS |
| 56 | 52 | |
| 57 | 53 | install:V: $O.$CONF |
| 58 | 54 | cp $O.$CONF $INSTALLDIR/$CONF |
| 59 | 55 | |
| 60 | −<../port/portmkfile | |
| 61 | − | |
| 62 | 56 | devfs.c:N: ../port/devfs-posix.c |
| @@ -1,12 +1,10 @@ | ||
| 1 | 1 | SYSTARG=MacOSX |
| 2 | −#OBJTYPE=power | |
| 3 | 2 | <../../mkconfig |
| 4 | 3 | SYSTARG=MacOSX |
| 5 | −#OBJTYPE=power | |
| 6 | 4 | |
| 7 | 5 | #Configurable parameters |
| 8 | 6 | |
| 9 | −CONF=emu #default configuration | |
| 7 | +CONF=emu-g #default configuration | |
| 10 | 8 | CONFLIST=emu |
| 11 | 9 | CLEANCONFLIST= |
| 12 | 10 | |
| @@ -37,26 +35,21 @@ CFLAGS='-DROOT="'$ROOT'"'\ · 24 unmodified lines | ||
| 37 | 35 | |
| 38 | 36 | KERNDATE=`{$NDATE} |
| 39 | 37 | |
| 40 | −LDFLAGS=$LDFLAGS -L/usr/X11R6/lib | |
| 41 | − | |
| 42 | 38 | SYSLIBS= \ |
| 43 | 39 | -lm\ |
| 44 | 40 | -lpthread\ |
| 45 | 41 | -framework CoreFoundation\ |
| 46 | 42 | -framework IOKit\ |
| 47 | −# -framework ApplicationServices\ | |
| 48 | 43 | |
| 49 | 44 | default:V: $O.$CONF |
| 50 | 45 | |
| 46 | +<../port/portmkfile | |
| 51 | 47 | |
| 52 | 48 | $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES |
| 53 | − $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c | |
| 49 | + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c | |
| 54 | 50 | $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS |
| 55 | 51 | |
| 56 | 52 | install:V: $O.$CONF |
| 57 | 53 | cp $O.$CONF $INSTALLDIR/$CONF |
| 58 | 54 | |
| 59 | −<../port/portmkfile | |
| 60 | − | |
| 61 | −ipif.c:N: ../FreeBSD/ipif.c | |
| 62 | 55 | devfs.c:N: ../port/devfs-posix.c |
| @@ -1,8 +1,6 @@ | ||
| 1 | 1 | SYSTARG=MacOSX |
| 2 | −#OBJTYPE=power | |
| 3 | 2 | <../../mkconfig |
| 4 | 3 | SYSTARG=MacOSX |
| 5 | −#OBJTYPE=power | |
| 6 | 4 | |
| 7 | 5 | #Configurable parameters |
| 8 | 6 | |
| @@ -46,19 +44,16 @@ SYSLIBS= \ · 37 unmodified lines | ||
| 46 | 44 | -lpthread\ |
| 47 | 45 | -framework CoreFoundation\ |
| 48 | 46 | -framework IOKit\ |
| 49 | −# -framework ApplicationServices\ | |
| 50 | 47 | |
| 51 | 48 | default:V: $O.$CONF |
| 52 | 49 | |
| 50 | +<../port/portmkfile | |
| 53 | 51 | |
| 54 | 52 | $O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES |
| 55 | − $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c | |
| 53 | + $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c | |
| 56 | 54 | $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS |
| 57 | 55 | |
| 58 | 56 | install:V: $O.$CONF |
| 59 | 57 | cp $O.$CONF $INSTALLDIR/$CONF |
| 60 | 58 | |
| 61 | −<../port/portmkfile | |
| 62 | − | |
| 63 | −ipif.c:N: ../FreeBSD/ipif.c | |
| 64 | 59 | devfs.c:N: ../port/devfs-posix.c |