Changeset 121

Show
Ignore:
Timestamp:
05/07/07 12:22:08 (2 years ago)
Author:
takkaria
Message:
  • First round of nuking ports: cap, lsl, sla, xpj. (see #110)
  • Nuke some debug code.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/Makefile.src

    r114 r121  
    1414ZFILES = z-file z-form z-rand z-term z-type z-util z-virt 
    1515MAINFILES = main maid-x11 \ 
    16         $(addprefix main-,cap crb dos gcu gtk ibm lsl ros sdl sla vcs win x11 xaw xpj) 
     16        $(addprefix main-,crb dos gcu gtk ibm ros sdl vcs win x11 xaw) 
    1717 
    1818ANGFILES = \ 

  • trunk/src/Makefile.std

    r53 r121  
    4444SYS_gtk = -DUSE_GTK $(shell pkg-config gtk+-2.0 --libs --cflags) 
    4545 
    46 # Support "projected mode". Experimental, requires X11/Xaw/GTK to be enabled (main-xpj.c) 
    47 #SYS_xpj = -DUSE_xpj 
    48  
    4946# Support raw console access (main-lfb.c) -- Linux only 
    5047SYS_lfb = -DUSE_LFB 
    51  
    52 # Support linux in VGA mode (main-lsl.c) -- Linux only 
    53 #SYS_lsl = -DUSE_LSL -lz -lvgagl -lvga 
    5448 
    5549# Support SDL frontend 
    …… 
    6559#SYS_vcs = -DUSE_VCS 
    6660 
    67 # Support Unix 'slang', also available on OS/2 (main-sla.c) 
    68 #SYS_sla = -DUSE_SLA -I/usr/include/slang -lslang 
    69  
    70 # Support primitive termcap emulation of a vt100 (slow and unreliable) (main-cap.c) 
    71 # -DUSE_HARDCODE in the unlikely event you are using a VT100 without curses 
    72 #SYS_cap = -DUSE_CAP -ltermcap 
    7361 
    7462 
    …… 
    10088 
    10189# Extract CFLAGS and LIBS from the system definitions 
    102 MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_xaw) $(SYS_gtk) $(SYS_xpj) $(SYS_sla) $(SYS_cap) $(SYS_sdl) 
     90MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_xaw) $(SYS_gtk) $(SYS_sdl) 
    10391CFLAGS += $(patsubst -l%,,$(MODULES)) $(INCLUDES) 
    10492LIBS += $(patsubst -D%,,$(patsubst -I%,, $(MODULES))) 
    …… 
    11098# Enable linux-specific modules, if requested. 
    11199ifeq ($(uname),Linux) 
    112   MODULES += $(SYS_lsl) $(SYS_lfb) $(SYS_vcs) 
    113   LINUXOBJS = main-lsl.o main-vcs.o main-lfb.o 
     100  MODULES += $(SYS_lfb) $(SYS_vcs) 
     101  LINUXOBJS = main-vcs.o main-lfb.o 
    114102  CFLAGS += -DHAVE_MKSTEMP 
    115103endif 
    …… 
    117105 
    118106# Object definitions 
    119 X11OBJS = maid-x11.o main-x11.o main-xaw.o main-gtk.o main-xpj.o 
    120 MAINOBJS = main.o main-cap.o main-gcu.o main-sla.o $(X11OBJS) $(LINUXOBJS) # main-sdl.o not yet 
     107X11OBJS = maid-x11.o main-x11.o main-xaw.o main-gtk.o 
     108MAINOBJS = main.o main-gcu.o main-sdl.o $(X11OBJS) $(LINUXOBJS) 
    121109OBJS = $(BASEOBJS) $(MAINOBJS) 
    122110 

  • trunk/src/load.c

    r117 r121  
    810810 
    811811                #undef OLD_OPT 
    812  
    813                 if (arg_fiddle) 
    814                 { 
    815                         FILE *ffff = fopen("options.txt", "wb"); 
    816                         int i; 
    817  
    818                         for (i = 0; i < OPT_SCORE; i++) 
    819                                 fprintf(ffff, "%3d %s: %s\n", 
    820                                         i, 
    821                                         (op_ptr->opt[i] ? "on " : "off"), 
    822                                         (option_text[i] ? option_text[i] : "NULL")); 
    823                 } 
    824812        } 
    825813