Переглянути джерело

use precompiled pcre version for mingw

Nicolas Cannasse 8 роки тому
батько
коміт
cd58c1ddb9
2 змінених файлів з 3 додано та 1 видалено
  1. 2 1
      Makefile
  2. 1 0
      Makefile.win

+ 2 - 1
Makefile

@@ -33,7 +33,8 @@ 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/pcre/pcre
 
-NATIVE_LIBS=-cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib -lz -cclib libs/objsize/c_objsize.o -cclib libs/pcre/pcre_stubs.o -cclib -lpcre -ccopt -L/usr/local/lib
+PCRE=-cclib -lpcre
+NATIVE_LIBS=-cclib libs/extc/extc_stubs.o -cclib libs/extc/process_stubs.o -cclib -lz -cclib libs/objsize/c_objsize.o -cclib libs/pcre/pcre_stubs.o $(PCRE) -ccopt -L/usr/local/lib
 
 ifeq ($(BYTECODE),1)
 	TARGET_FLAG = bytecode

+ 1 - 0
Makefile.win

@@ -10,6 +10,7 @@ kill:
 	-@taskkill /F /IM haxe.exe
 
 # allow Ocaml/Mingw as well
+PCRE=-cclib libs/pcre/pcre/libpcre.dll.a
 NATIVE_LIBS += -I "c:/program files/mingw/lib/"
 
 # use make WODI=wodi32 -f Makefile.win to build using WODI 32bit