urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-24 13:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ignore the strange earth-husk around cre2

Browse Source
This commit is contained in:
Steven Dee 2014-04-10 04:22:55 -07:00
parent ee5759ca18
commit 8cfb9cf1ac
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -34,6 +34,8 @@ LIB=$(PWD)/lib
RM=rm -f RM=rm -f
CC=gcc CC=gcc
CXX=g++
CXXFLAGS=$(CFLAGS)
CLD=g++ -O2 -g -L/usr/local/lib -L/opt/local/lib CLD=g++ -O2 -g -L/usr/local/lib -L/opt/local/lib
YACC=bison -v -b$(GENERATED)/y YACC=bison -v -b$(GENERATED)/y
LEX=lex LEX=lex
@ -527,6 +529,9 @@ BASE_OFILES=\
$(F_OFILES) \ $(F_OFILES) \
$(J164_OFILES) $(J164_OFILES)
CRE2_OFILES=\
outside/cre2/src/src/cre2.o
OUT_OFILES=\ OUT_OFILES=\
outside/jhttp/http_parser.o outside/jhttp/http_parser.o
@ -547,20 +552,20 @@ V_OFILES=\
v/walk.o v/walk.o
VERE_OFILES=\ VERE_OFILES=\
$(V_OFILES) \
$(BASE_OFILES) \ $(BASE_OFILES) \
$(OUT_OFILES) $(CRE2_OFILES) \
$(OUT_OFILES) \
$(V_OFILES)
LIBUV=outside/libuv/libuv.a LIBUV=outside/libuv/libuv.a
LIBCRE=outside/cre2/lib/libcre2.a
all: $(BIN)/vere all: $(BIN)/vere
$(LIBUV): $(LIBUV):
$(MAKE) -C outside/libuv libuv.a $(MAKE) -C outside/libuv libuv.a
$(LIBCRE): $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h
cd outside/cre2/src && sh build.sh $(CXX) $(CXXFLAGS) -c $< -o $@
$(V_OFILES) f/loom.o f/trac.o: include/v/vere.h $(V_OFILES) f/loom.o f/trac.o: include/v/vere.h

16
outside/cre2/src/src/cre2.cpp
View File

@ -26,22 +26,38 @@
const char * const char *
cre2_version_string (void) cre2_version_string (void)
{ {
#ifdef HAVE_CONFIG_H
return cre2_VERSION_INTERFACE_STRING; return cre2_VERSION_INTERFACE_STRING;
#else
return "0.0";
#endif
} }
int int
cre2_version_interface_current (void) cre2_version_interface_current (void)
{ {
#ifdef HAVE_CONFIG_H
return cre2_VERSION_INTERFACE_CURRENT; return cre2_VERSION_INTERFACE_CURRENT;
#else
return 0;
#endif
} }
int int
cre2_version_interface_revision (void) cre2_version_interface_revision (void)
{ {
#ifdef HAVE_CONFIG_H
return cre2_VERSION_INTERFACE_REVISION; return cre2_VERSION_INTERFACE_REVISION;
#else
return 0;
#endif
} }
int int
cre2_version_interface_age (void) cre2_version_interface_age (void)
{ {
#ifdef HAVE_CONFIG_H
return cre2_VERSION_INTERFACE_AGE; return cre2_VERSION_INTERFACE_AGE;
#else
return 0;
#endif
} }