summaryrefslogtreecommitdiff
path: root/emu
diff options
context:
space:
mode:
Diffstat (limited to 'emu')
-rw-r--r--emu/FreeBSD/emu2
-rw-r--r--emu/FreeBSD/mkfile1
-rw-r--r--emu/Hp/emu2
-rw-r--r--emu/Hp/mkfile1
-rw-r--r--emu/Irix/emu2
-rw-r--r--emu/Irix/mkfile1
-rw-r--r--emu/Linux/emu2
-rw-r--r--emu/Linux/mkfile1
-rw-r--r--emu/Linux/mkfile-g47
-rw-r--r--emu/MacOSX/emu2
-rw-r--r--emu/MacOSX/mkfile1
-rw-r--r--emu/MacOSX/mkfile-g2
-rw-r--r--emu/NetBSD/emu2
-rw-r--r--emu/NetBSD/mkfile1
-rw-r--r--emu/Nt/emu2
-rw-r--r--emu/Nt/ie3
-rw-r--r--emu/Nt/mkfile2
-rw-r--r--emu/Plan9/emu2
-rw-r--r--emu/Plan9/emusig2
-rw-r--r--emu/Plan9/mkfile6
-rw-r--r--emu/Solaris/emu2
-rw-r--r--emu/Solaris/mkfile1
-rw-r--r--emu/Unixware/emu2
-rw-r--r--emu/Unixware/mkfile1
24 files changed, 14 insertions, 76 deletions
diff --git a/emu/FreeBSD/emu b/emu/FreeBSD/emu
index 5130db7c..257df186 100644
--- a/emu/FreeBSD/emu
+++ b/emu/FreeBSD/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/FreeBSD/mkfile b/emu/FreeBSD/mkfile
index 32eb0044..0b206a0b 100644
--- a/emu/FreeBSD/mkfile
+++ b/emu/FreeBSD/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11a.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Hp/emu b/emu/Hp/emu
index 88bb23e4..806c642c 100644
--- a/emu/Hp/emu
+++ b/emu/Hp/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/Hp/mkfile b/emu/Hp/mkfile
index ef7c6db1..f332db7a 100644
--- a/emu/Hp/mkfile
+++ b/emu/Hp/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Irix/emu b/emu/Irix/emu
index f689662e..e5d92554 100644
--- a/emu/Irix/emu
+++ b/emu/Irix/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/Irix/mkfile b/emu/Irix/mkfile
index 5d121eea..51825866 100644
--- a/emu/Irix/mkfile
+++ b/emu/Irix/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11a.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Linux/emu b/emu/Linux/emu
index 014e421d..0e7c17f9 100644
--- a/emu/Linux/emu
+++ b/emu/Linux/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/Linux/mkfile b/emu/Linux/mkfile
index ee2152d0..77693e4e 100644
--- a/emu/Linux/mkfile
+++ b/emu/Linux/mkfile
@@ -19,7 +19,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11a.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Linux/mkfile-g b/emu/Linux/mkfile-g
deleted file mode 100644
index 77693e4e..00000000
--- a/emu/Linux/mkfile-g
+++ /dev/null
@@ -1,47 +0,0 @@
-SYSTARG=Linux
-<../../mkconfig
-SYSTARG=Linux
-
-#Configurable parameters
-
-CONF=emu #default configuration
-CONFLIST=emu
-CLEANCONFLIST=
-
-INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is installed
-
-#end configurable parameters
-
-<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
-
-<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
-
-OBJ=\
- asm-$OBJTYPE.$O\
- os.$O\
- $CONF.root.$O\
- lock.$O\
- $DEVS\
- $PORT\
-
-LIBNAMES=${LIBS:%=lib%.a}
-#libs=${LIBS:%=$ROOT/$OBJDIR/lib/lib%.a}
-
-HFILES=\
-
-CFLAGS='-DROOT="'$ROOT'"' -DEMU -I. -I../port -I$ROOT/$SYSTARG/$OBJTYPE/include -I$ROOT/include -I$ROOT/libinterp $CTHREADFLAGS $CFLAGS $EMUOPTIONS
-SYSLIBS= -lm -lX11 -lXext
-KERNDATE=`{$NDATE}
-
-default:V: $O.$CONF
-
-$O.$CONF: $OBJ $CONF.c $CONF.root.h $LIBNAMES
- $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.$O: ../port/devfs-posix.c
diff --git a/emu/MacOSX/emu b/emu/MacOSX/emu
index 1e64298b..91efe264 100644
--- a/emu/MacOSX/emu
+++ b/emu/MacOSX/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win
pointer
snarf
diff --git a/emu/MacOSX/mkfile b/emu/MacOSX/mkfile
index b077d95c..5f716701 100644
--- a/emu/MacOSX/mkfile
+++ b/emu/MacOSX/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/MacOSX/mkfile-g b/emu/MacOSX/mkfile-g
index b39d872f..c1f9fa4b 100644
--- a/emu/MacOSX/mkfile-g
+++ b/emu/MacOSX/mkfile-g
@@ -29,11 +29,11 @@ OBJ=\
HFILES=\
CFLAGS='-DROOT="'$ROOT'"'\
+ '-DOBJTYPE="'$OBJTYPE'"'\
-DEMU -I. -I../port\
-I$ROOT/$SYSTARG/$OBJTYPE/include\
-I$ROOT/include -I$ROOT/libinterp\
$CTHREADFLAGS $CFLAGS $EMUOPTIONS\
- -I/usr/X11R6/include
KERNDATE=`{$NDATE}
diff --git a/emu/NetBSD/emu b/emu/NetBSD/emu
index 5130db7c..257df186 100644
--- a/emu/NetBSD/emu
+++ b/emu/NetBSD/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/NetBSD/mkfile b/emu/NetBSD/mkfile
index 673517dd..8531a68b 100644
--- a/emu/NetBSD/mkfile
+++ b/emu/NetBSD/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11a.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Nt/emu b/emu/Nt/emu
index 296dca53..14530018 100644
--- a/emu/Nt/emu
+++ b/emu/Nt/emu
@@ -17,7 +17,7 @@ dev
cmd cmd
indir
- draw
+ draw win
ip ipif ipaux
eia
diff --git a/emu/Nt/ie b/emu/Nt/ie
index 24323dd1..e92d72d5 100644
--- a/emu/Nt/ie
+++ b/emu/Nt/ie
@@ -1,6 +1,5 @@
env
LDFLAGS= -subsystem:windows $LDFLAGS
- WINX= ie-win
OSX= ie-os
dev
@@ -18,7 +17,7 @@ dev
fs
indir
- draw
+ draw ie-win
ip ipif ipaux
eia
diff --git a/emu/Nt/mkfile b/emu/Nt/mkfile
index 30acf67c..e1e9d24d 100644
--- a/emu/Nt/mkfile
+++ b/emu/Nt/mkfile
@@ -17,7 +17,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
#end configurable parameters
OSX=os
-WINX=win
<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
@@ -25,7 +24,6 @@ WINX=win
OBJ=\
$OSX.$O\
- $WINX.$O\
$CONF.root.$O\
lock.$O\
fp.$O\
diff --git a/emu/Plan9/emu b/emu/Plan9/emu
index 4583bca2..0a6c0f53 100644
--- a/emu/Plan9/emu
+++ b/emu/Plan9/emu
@@ -15,7 +15,7 @@ dev
indir
sign
- draw
+ draw win
pointer
dynld
diff --git a/emu/Plan9/emusig b/emu/Plan9/emusig
index 20c6f0d4..1975a4cc 100644
--- a/emu/Plan9/emusig
+++ b/emu/Plan9/emusig
@@ -14,7 +14,7 @@ dev
indir
sign
- draw
+ draw win
# ip and eia are simply bound in from Plan 9
diff --git a/emu/Plan9/mkfile b/emu/Plan9/mkfile
index 2b03031a..a7266830 100644
--- a/emu/Plan9/mkfile
+++ b/emu/Plan9/mkfile
@@ -14,15 +14,11 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
<$ROOT/mkfiles/mkfile-$SYSTARG-$OBJTYPE #set vars based on target system
-OSX=os
-WINX=win
-
<| $SHELLNAME ../port/mkdevlist $CONF #sets $IP, $DEVS, $PORT, $LIBS
OBJ=\
asm-$OBJTYPE.$O\
- $OSX.$O\
- $WINX.$O\
+ os.$O\
$CONF.root.$O\
$DEVS\
$PORT\
diff --git a/emu/Solaris/emu b/emu/Solaris/emu
index 89f7637b..a72e6b7b 100644
--- a/emu/Solaris/emu
+++ b/emu/Solaris/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/Solaris/mkfile b/emu/Solaris/mkfile
index 498a4e86..6f578086 100644
--- a/emu/Solaris/mkfile
+++ b/emu/Solaris/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11a.$O\
$CONF.root.$O\
lock.$O\
$DEVS\
diff --git a/emu/Unixware/emu b/emu/Unixware/emu
index 4c983199..fd657978 100644
--- a/emu/Unixware/emu
+++ b/emu/Unixware/emu
@@ -14,7 +14,7 @@ dev
cmd cmd
indir
- draw
+ draw win-x11a
pointer
snarf
diff --git a/emu/Unixware/mkfile b/emu/Unixware/mkfile
index 1703b426..dae437bf 100644
--- a/emu/Unixware/mkfile
+++ b/emu/Unixware/mkfile
@@ -21,7 +21,6 @@ INSTALLDIR=$ROOT/$SYSTARG/$OBJTYPE/bin #path of directory where kernel is instal
OBJ=\
asm-$OBJTYPE.$O\
os.$O\
- win-x11.$O\
$CONF.root.$O\
lock.$O\
$DEVS\