[ScryMUD] SVN Commit Info r780 - in trunk/mud: . grrmud/server

[scrymud at wanfear.com]

Author: eroper
Date: 2004-12-18 14:50:29 -0800 (Sat, 18 Dec 2004)
New Revision: 780

Modified:
   trunk/mud/MakeInclude.bh
   trunk/mud/grrmud/server/Makefile
   trunk/mud/grrmud/server/regex.cc
Log:
We'll successfully link now.


Modified: trunk/mud/MakeInclude.bh
===================================================================
--- trunk/mud/MakeInclude.bh	2004-12-18 20:50:48 UTC (rev 779)
+++ trunk/mud/MakeInclude.bh	2004-12-18 22:50:29 UTC (rev 780)
@@ -16,7 +16,7 @@
 # NOTE:  Use these variables if you are using EGCS and glibc 5
 CCFLAGS = -g -D_GNU_SOURCE $(BG_NEW_GCC_TEMPLATES) $(GUIDING_DECLS) $(HUGE_OBJECTS) \
           -Wall -Wno-deprecated -I$(MUD_HOME)/include
-LDLIBS =  -lm -lstring2 -lbitfield -lcrypt #-lnsl # -lsocket
+LDLIBS =  -lm -lstring2 -lbitfield -lcrypt -lpcre#-lnsl # -lsocket
 
 
 # NOTE:  For Cygwin users:

Modified: trunk/mud/grrmud/server/Makefile
===================================================================
--- trunk/mud/grrmud/server/Makefile	2004-12-18 20:50:48 UTC (rev 779)
+++ trunk/mud/grrmud/server/Makefile	2004-12-18 22:50:29 UTC (rev 780)
@@ -23,7 +23,8 @@
 ez_spll.cc dam_spll.cc trv_spll.cc rm_spll.cc dam_skll.cc wep_skll.cc \
 ez_skll.cc social2.cc cr_skll.cc ar_skll.cc pet_spll.cc vehicle.cc \
 script.cc SkillSpell.cc zone.cc rm_parse.cc rm_cmds.cc obj_parse.cc \
-obj_cmds.cc BugEntry.cc MudStats.cc clients.cc ServerConfig.cc mapper.cc
+obj_cmds.cc BugEntry.cc MudStats.cc clients.cc ServerConfig.cc mapper.cc \
+regex.cc
 
 OBJS = parse_gen.o lang_strings.o classes.o object.o critter.o \
 Filters.o room.o door.o skills.o command3.o \
@@ -34,7 +35,7 @@
 ez_skll.o social2.o cr_skll.o ar_skll.o pet_spll.o vehicle.o const.o \
 script.o SkillSpell.o zone.o rm_parse.o rm_cmds.o obj_parse.o \
 obj_cmds.o BuildInfo.o BugEntry.o MudStats.o clients.o ServerConfig.o \
-mapper.o
+mapper.o regex.o
 
 GEN_SPEC = gen_cmds.spec
 LANG_SPEC = translations.spec translations_classes.spec translation2.spec \

Modified: trunk/mud/grrmud/server/regex.cc
===================================================================
--- trunk/mud/grrmud/server/regex.cc	2004-12-18 20:50:48 UTC (rev 779)
+++ trunk/mud/grrmud/server/regex.cc	2004-12-18 22:50:29 UTC (rev 780)
@@ -49,7 +49,7 @@
    if (re == NULL) {
       Sprintf(err_msg, "REGEX compilation failed at %d: %s\n",
             err_offset, err);
-      delete err;
+      free((void*)err);
       return NULL;
    }
    pattern = new_pat;