History

20101206-0059

forsyth committed 15 years ago

Commit 69ba72a1 parent 3adf1a34 files · +8 −25Browse files

Unified · Split

4 files
  1. CHANGES +1 −0
  2. emu/MacOSX/mkfile +2 −8
  3. emu/MacOSX/mkfile-g +3 −10
  4. emu/MacOSX/mkfile-x11 +2 −7
CHANGES+1−0
@@ -1,5 +1,6 @@
120101205120101205
2 change a few types in ipif-posix.c to appease the gods2 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]
320101127420101127
4 emu/port/*ip*.[ch] and emu/Nt/ipif*.c updated with new interface for ipv6 support [mechiel] [issue 193]5 emu/port/*ip*.[ch] and emu/Nt/ipif*.c updated with new interface for ipv6 support [mechiel] [issue 193]
5 emu/Linux/os.c address compilation warnings (setfcr etc still to do)6 emu/Linux/os.c address compilation warnings (setfcr etc still to do)
emu/MacOSX/mkfile+2−8
@@ -1,8 +1,6 @@
1SYSTARG=MacOSX1SYSTARG=MacOSX
2#OBJTYPE=power
3<../../mkconfig2<../../mkconfig
4SYSTARG=MacOSX3SYSTARG=MacOSX
5#OBJTYPE=power
6 4
7#Configurable parameters5#Configurable parameters
8 6
@@ -37,26 +35,22 @@ CFLAGS='-DROOT="'$ROOT'"'\ · 28 unmodified lines
37 35
38KERNDATE=`{$NDATE}36KERNDATE=`{$NDATE}
39 37
40LDFLAGS=$LDFLAGS -L/usr/X11R6/lib
41
42SYSLIBS= \38SYSLIBS= \
43 -lm\39 -lm\
44 -framework Carbon -framework QuickTime\40 -framework Carbon -framework QuickTime\
45 -lpthread\41 -lpthread\
46 -framework CoreFoundation\42 -framework CoreFoundation\
47 -framework IOKit\43 -framework IOKit\
48# -framework ApplicationServices\
49 44
50default:V: $O.$CONF45default:V: $O.$CONF
51 46
47<../port/portmkfile
52 48
53$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES49$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES
54 $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c50 $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c
55 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS51 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS
56 52
57install:V: $O.$CONF53install:V: $O.$CONF
58 cp $O.$CONF $INSTALLDIR/$CONF54 cp $O.$CONF $INSTALLDIR/$CONF
59 55
60<../port/portmkfile
61
62devfs.c:N: ../port/devfs-posix.c56devfs.c:N: ../port/devfs-posix.c
emu/MacOSX/mkfile-g+3−10
@@ -1,12 +1,10 @@
1SYSTARG=MacOSX1SYSTARG=MacOSX
2#OBJTYPE=power
3<../../mkconfig2<../../mkconfig
4SYSTARG=MacOSX3SYSTARG=MacOSX
5#OBJTYPE=power
6 4
7#Configurable parameters5#Configurable parameters
8 6
9CONF=emu #default configuration7CONF=emu-g #default configuration
10CONFLIST=emu8CONFLIST=emu
11CLEANCONFLIST=9CLEANCONFLIST=
12 10
@@ -37,26 +35,21 @@ CFLAGS='-DROOT="'$ROOT'"'\ · 24 unmodified lines
37 35
38KERNDATE=`{$NDATE}36KERNDATE=`{$NDATE}
39 37
40LDFLAGS=$LDFLAGS -L/usr/X11R6/lib
41
42SYSLIBS= \38SYSLIBS= \
43 -lm\39 -lm\
44 -lpthread\40 -lpthread\
45 -framework CoreFoundation\41 -framework CoreFoundation\
46 -framework IOKit\42 -framework IOKit\
47# -framework ApplicationServices\
48 43
49default:V: $O.$CONF44default:V: $O.$CONF
50 45
46<../port/portmkfile
51 47
52$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES48$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES
53 $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c49 $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c
54 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS50 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS
55 51
56install:V: $O.$CONF52install:V: $O.$CONF
57 cp $O.$CONF $INSTALLDIR/$CONF53 cp $O.$CONF $INSTALLDIR/$CONF
58 54
59<../port/portmkfile
60
61ipif.c:N: ../FreeBSD/ipif.c
62devfs.c:N: ../port/devfs-posix.c55devfs.c:N: ../port/devfs-posix.c
emu/MacOSX/mkfile-x11+2−7
@@ -1,8 +1,6 @@
1SYSTARG=MacOSX1SYSTARG=MacOSX
2#OBJTYPE=power
3<../../mkconfig2<../../mkconfig
4SYSTARG=MacOSX3SYSTARG=MacOSX
5#OBJTYPE=power
6 4
7#Configurable parameters5#Configurable parameters
8 6
@@ -46,19 +44,16 @@ SYSLIBS= \ · 37 unmodified lines
46 -lpthread\44 -lpthread\
47 -framework CoreFoundation\45 -framework CoreFoundation\
48 -framework IOKit\46 -framework IOKit\
49# -framework ApplicationServices\
50 47
51default:V: $O.$CONF48default:V: $O.$CONF
52 49
50<../port/portmkfile
53 51
54$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES52$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBFILES
55 $CC $CFLAGS -DKERNDATE=$KERNDATE $CONF.c53 $CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c
56 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS54 $LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS
57 55
58install:V: $O.$CONF56install:V: $O.$CONF
59 cp $O.$CONF $INSTALLDIR/$CONF57 cp $O.$CONF $INSTALLDIR/$CONF
60 58
61<../port/portmkfile
62
63ipif.c:N: ../FreeBSD/ipif.c
64devfs.c:N: ../port/devfs-posix.c59devfs.c:N: ../port/devfs-posix.c