(main,termio): Add the ability to set the username.

Get it from environment variable LOGNAME if set,
else get the user name from the system.

diff --git a/src/client/Makefile b/src/client/Makefile
index eca5d837a19d4f105c1576306c3ca3c7429a714b..e98a769b05246b933f7a72f533929d6fe490a2d9 100644 (file)
--- a/src/client/Makefile
+++ b/src/client/Makefile
@@ -58,16 +58,7 @@ emp_client: $(OFILES)
 nt: emp_client.exe
 
 emp_client.exe: $(OBJFILES) $(CFILES)
 nt: emp_client.exe
 
 emp_client.exe: $(OBJFILES) $(CFILES)

-       link /OUT:emp_client.exe \
-        /PDB:emp_client.pdb  /NOLOGO \
-        /NOD /DEBUG:full /DEBUGTYPE:cv /MACHINE:IX86 /NOLOGO \
-        $(OBJFILES) \
-        kernel32.lib \
-        wsock32.lib \
-        libcmt.lib \
-        oldnames.lib
-
-#      cl /D_WIN32 /Feemp_client.exe $(CFILES) wsock32.lib
+       cl $(CFLAGS) /Feemp_client.exe $(OBJFILES) wsock32.lib advapi32.lib

 
 dgux: $(OFILES) 
        $(CC) $(CFLAGS) -dn -o emp_client $(OFILES) -lsocket -lnsl -ltermcap -lc
 
 dgux: $(OFILES) 
        $(CC) $(CFLAGS) -dn -o emp_client $(OFILES) -lsocket -lnsl -ltermcap -lc

diff --git a/src/client/Makefile.standalone b/src/client/Makefile.standalone
index a2ad67224098356c9fc12578663bc4362c9112d5..9f753bd56fa04cf60dabbef3df5f99944891b03c 100644 (file)
--- a/src/client/Makefile.standalone
+++ b/src/client/Makefile.standalone
@@ -53,7 +53,7 @@ linux: $(OFILES)
        $(CC) -o empire $(OFILES) -lcurses
 
 nt:
        $(CC) -o empire $(OFILES) -lcurses
 
 nt:

-       cl /DWIN32 /Feempire.exe $(CFILES) wsock32.lib
+       cl /DWIN32 /Feempire.exe $(CFILES) wsock32.lib advapi32.lib

 
 dgux: $(OFILES) 
        $(CC) $(CFLAGS) -dn -o empire $(OFILES) -lsocket -lnsl -ltermcap -lc
 
 dgux: $(OFILES) 
        $(CC) $(CFLAGS) -dn -o empire $(OFILES) -lsocket -lnsl -ltermcap -lc