define PCRE_STATIC to reflect the inclusion of pcre as LIB, not

2007-03-17  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in glib/pcre/makefile.msc 
	  glib/update-pcre/update.sh : define PCRE_STATIC to reflect the 
	inclusion of pcre as LIB, not stand-alone DLL. Also set NEWLINE=-1
	to match any newline by default, use of ../../build/win32/make.msc

	* glib/gregex.h : minimal includes of <glib/*.H> instead of <glib.h>

	* glib/gnulib/makefile.msc : make use of ../../build/win32/make.msc

	* tests/regex-test.c(verbose): don't pass a string containing '%' 
	as first parameter to g_print ()
	(test_match) : for the unexpected case output pattern and string
	escaped

	* tests/child-test.c tests/slice-color.c : fix c99ism
	* tests/slice-test.c : fix c99ism and gccism
	* tests/mapping-test.c tests/base-64-tests.c : don't 
	#include <unistd.h> unconditionally
	* tests/option-test.c : use G_GINT64_CONSTANT() instead of direct LL

	* tests/makefile.msc.in : more tests build


svn path=/trunk/; revision=5423
This commit is contained in:
Hans Breuer
2007-03-17 09:49:09 +00:00
committed by Hans Breuer
parent 45b2988d05
commit 770b29bad2
14 changed files with 157 additions and 80 deletions

View File

@@ -1,10 +1,8 @@
!IFDEF DEBUG
CRT=-MDd
!ELSE
CRT=-MD
!ENDIF
TOP = ..\..\..
!INCLUDE ..\..\build\win32\make.msc
CFLAGS = -I ..\.. -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT
INCLUDES = -I ..\..
DEFINES = -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT
OBJECTS = \
asnprintf.obj \
@@ -13,8 +11,8 @@ OBJECTS = \
printf-parse.obj \
vasnprintf.obj
all : gnulib.lib
gnulib.lib : $(OBJECTS)
lib -out:gnulib.lib $(OBJECTS)
.c.obj:
$(CC) $(CRT) $(CFLAGS) -Ox -GD -c $<