Changeset 62


Ignore:
Timestamp:
Mar 2, 2008, 5:35:46 PM (10 years ago)
Author:
Sam Hocevar
Message:
  • Moved some LISP stuff into src/lisp and removed unused lisp_mac.cpp file.
Location:
abuse/trunk
Files:
2 added
2 deleted
5 edited
6 moved

Legend:

Unmodified
Added
Removed
  • abuse/trunk/configure.ac

    r42 r62  
    8787    abuse.6
    8888    src/Makefile
     89    src/lisp/Makefile
    8990    src/net/Makefile
    9091    src/imlib/Makefile
  • abuse/trunk/src/Makefile.am

    r57 r62  
    11## Process this file with automake to produce Makefile.in
    22
    3 SUBDIRS = net imlib sdlport
     3SUBDIRS = lisp net imlib sdlport
    44
    55bin_PROGRAMS = abuse
     
    88        chat.cpp endgame.cpp version.cpp loadgame.cpp profile.cpp \
    99        cop.cpp statbar.cpp compiled.cpp ant.cpp sensor.cpp \
    10         lisp_opt.cpp demo.cpp lcache.cpp lisp_gc.cpp nfclient.cpp \
     10        demo.cpp lcache.cpp nfclient.cpp \
    1111        username.cpp clisp.cpp gui.cpp transp.cpp collide.cpp trig.cpp \
    12         property.cpp lisp.cpp cache.cpp particle.cpp objects.cpp \
     12        property.cpp cache.cpp particle.cpp objects.cpp \
    1313        extend.cpp console.cpp ability.cpp items.cpp dev.cpp chars.cpp \
    1414        level.cpp smallfnt.cpp automap.cpp help.cpp intsect.cpp \
     
    1717        devsel.cpp crc.cpp gamma.cpp language.cpp
    1818
    19 abuse_LDADD = ./sdlport/libsdlport.a ./imlib/libimlib.a ./net/libnet.a
     19EXTRALIBS = lisp/liblisp.a sdlport/libsdlport.a imlib/libimlib.a net/libnet.a
     20abuse_LDADD = $(EXTRALIBS)
     21abuse_DEPENDENCIES = $(EXTRALIBS)
    2022
    21 abuse_DEPENDENCIES = ./sdlport/libsdlport.a ./imlib/libimlib.a ./net/libnet.a
    22 
    23 INCLUDES = -I$(srcdir) -I$(srcdir)/imlib -I$(srcdir)/net $(SDL_CFLAGS)
     23INCLUDES = -I$(srcdir) -I $(srcdir)/lisp -I$(srcdir)/imlib \
     24           -I$(srcdir)/net $(SDL_CFLAGS)
    2425
    2526CPPFLAGS = @CPPFLAGS@ -DMANAGE_MEM -DNO_CHECK
  • abuse/trunk/src/cache.hpp

    r57 r62  
    1212
    1313#include <stdlib.h>
     14
     15#include "lisp/lisp.hpp"
     16
    1417#include "specs.hpp"
    1518#include "items.hpp"
    1619#include "sound.hpp"
    1720#include "particle.hpp"
    18 #include "lisp.hpp"
    1921
    2022class level;
  • abuse/trunk/src/extend.hpp

    r57 r62  
    1818
    1919
     20#include "lisp/lisp.hpp"
     21
    2022#include "jmalloc.hpp"
    2123#include "macs.hpp"
    2224#include "morpher.hpp"
    2325#include "chars.hpp"
    24 #include "lisp.hpp"
    2526
    2627
  • abuse/trunk/src/loader2.hpp

    r57 r62  
    1111#define __LOADER_HPP_
    1212
     13#include "lisp/lisp.hpp"
     14
    1315#include "jwindow.hpp"
    14 #include "lisp.hpp"
    1516#include "sound.hpp"
    1617class property_manager;
Note: See TracChangeset for help on using the changeset viewer.