Browse Source

link PCRE

Simon Krajewski 8 years ago
parent
commit
16df0cc19f
2 changed files with 6 additions and 4 deletions
  1. 5 3
      Makefile
  2. 1 1
      libs

+ 5 - 3
Makefile

@@ -26,14 +26,14 @@ OCAMLC?=ocamlc
 LFLAGS=
 
 CFLAGS= -bin-annot
-ALL_CFLAGS= $(CFLAGS) -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize \
+ALL_CFLAGS= $(CFLAGS) -g -w -3 -I libs/extlib -I libs/extc -I libs/neko -I libs/javalib -I libs/ziplib -I libs/swflib -I libs/xml-light -I libs/ttflib -I libs/ilib -I libs/objsize -I libs/pcre \
 	-I src -I src/context -I src/generators -I src/macro -I src/optimization -I src/syntax -I src/typing -I src/display
 
 LIBS=unix str libs/extlib/extLib libs/xml-light/xml-light libs/swflib/swflib \
 	libs/extc/extc libs/neko/neko libs/javalib/java libs/ziplib/zip \
-	libs/ttflib/ttf libs/ilib/il libs/objsize/objsize
+	libs/ttflib/ttf libs/ilib/il libs/objsize/objsize libs/pcre/pcre
 
-NATIVE_LIBS=-cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib -lz -cclib libs/objsize/c_objsize.o
+NATIVE_LIBS=-cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib -lz -cclib -lpcre -cclib libs/objsize/c_objsize.o -cclib libs/pcre/pcre_stubs.o
 
 ifeq ($(BYTECODE),1)
 	TARGET_FLAG = bytecode
@@ -98,6 +98,7 @@ libs:
 	make -C libs/xml-light OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
 	make -C libs/ttflib OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
 	make -C libs/objsize OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
+	make -C libs/pcre OCAMLOPT=$(OCAMLOPT) OCAMLC=$(OCAMLC) $(TARGET_FLAG)
 
 haxe: $(MODULES:%=src/%.$(MODULE_EXT))
 	$(COMPILER) -o $(OUTPUT) $(NATIVE_LIBS) $(NATIVE_LIB_FLAG) $(LFLAGS) $(LIBS:=.$(LIB_EXT)) $(MODULES:%=src/%.$(MODULE_EXT))
@@ -318,6 +319,7 @@ clean_libs:
 	make -C libs/xml-light clean
 	make -C libs/ttflib clean
 	make -C libs/objsize clean
+	make -C libs/pcre clean
 
 clean_haxe:
 	rm -f -r  $(MODULES:%=src/%.obj) $(MODULES:%=src/%.o) $(MODULES:%=src/%.cmx) $(MODULES:%=src/%.cmi) $(MODULES:%=src/%.cmo) $(MODULES:%=src/%.cmt) src/syntax/lexer.ml src/version.ml $(OUTPUT)

+ 1 - 1
libs

@@ -1 +1 @@
-Subproject commit 26d15367c229b93ef2346bf7876e681b58c18a65
+Subproject commit 52b8fca8be0d089b8aeee8dd7d8cf9db9cd87c3e