pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 pixman/Makefile.am    |    2 +
 pixman/Makefile.win32 |   68 +++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 53 insertions(+), 17 deletions(-)

New commits:
commit e2cbe1a0a4db750ab05d804901f155adb312746b
Author: Frédéric Plourde <frederic.plourde at polymtl.ca>
Date:   Thu Sep 4 16:30:21 2008 -0400

    Win32 build system fixes
    
    Signed-off-by: Søren Sandmann Pedersen <sandmann at daimi.au.dk>

diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32
index f7ecd25..ad30f8c 100644
--- a/pixman/Makefile.win32
+++ b/pixman/Makefile.win32
@@ -3,19 +3,27 @@ LIBRARY     = pixman-1
 CC   = cl
 LINK = link
 
-ifeq ($(CFG),)
-CFG=release
+CFG_VAR = $(CFG)
+ifeq ($(CFG_VAR),)
+CFG_VAR=release
 endif
 
-ifeq ($(MMX),)
-MMX=1
+MMX_VAR = $(MMX)
+ifeq ($(MMX_VAR),)
+MMX_VAR=on
+endif
+
+SSE2_VAR = $(SSE2)
+ifeq ($(SSE2_VAR),)
+SSE2_VAR=on
 endif
 
 CFLAGS     = -MD -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -I../pixman/src -I. -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
 MMX_CFLAGS = -DUSE_MMX -w14710 -w14714
+SSE2_CFLAGS = -DUSE_SSE2
 
 # optimization flags
-ifeq ($(CFG),debug)
+ifeq ($(CFG_VAR),debug)
 CFLAGS += -Od -Zi
 else
 CFLAGS += -O2
@@ -44,24 +52,31 @@ SOURCES = \
 	$(NULL)
 
 # MMX compilation flags
-ifeq ($(MMX),1)
+ifeq ($(MMX_VAR),on)
 CFLAGS += $(MMX_CFLAGS)
 SOURCES += pixman-mmx.c
 endif
 
-OBJECTS     = $(patsubst %.c, $(CFG)/%.obj, $(SOURCES))
+# SSE2 compilation flags
+ifeq ($(SSE2_VAR),on)
+CFLAGS += $(SSE2_CFLAGS)
+SOURCES += pixman-sse2.c
+endif
+
+OBJECTS     = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES))
 
 # targets
-all: inform informMMX $(CFG)/$(LIBRARY).lib
+all: inform informMMX informSSE2 $(CFG_VAR)/$(LIBRARY).lib
 	@exit 0
 clean: inform clean_r 
 	@exit 0
-pixman: inform informMMX $(CFG)/$(LIBRARY).lib 
+pixman: inform informMMX informSSE2 $(CFG_VAR)/$(LIBRARY).lib 
 	@exit 0
 
 inform:
 ifneq ($(CFG),release)
 ifneq ($(CFG),debug)
+ifneq ($(CFG),)
 	@echo "Invalid specified configuration option : "$(CFG)"."
 	@echo
 	@echo -n "Possible choices for configuration are "
@@ -69,25 +84,44 @@ ifneq ($(CFG),debug)
 	@echo ""
 	@exit 1
 endif
+	@echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
+endif
 endif
 
 informMMX:
-ifneq ($(MMX),0)
-ifneq ($(MMX),1)
-	@echo "Invalid specified MMX option : "$(MMX)"."
+ifneq ($(MMX),off)
+ifneq ($(MMX),on)
+ifneq ($(MMX),)
+	@echo "Invalid specified MMX option : "$(MMX_VAR)"."
 	@echo
-	@echo -n "Possible choices for MMX are 0 or 1"
+	@echo -n "Possible choices for MMX are 'on' or 'off'"
 	@echo ""
 	@exit 1
 endif
+	@echo "Setting MMX flag to default value 'on'... (use MMX=on or MMX=off)"
+endif
+endif
+
+informSSE2:
+ifneq ($(SSE2),off)
+ifneq ($(SSE2),on)
+ifneq ($(SSE2),)
+	@echo "Invalid specified SSE option : "$(SSE2)"."
+	@echo
+	@echo -n "Possible choices for SSE2 are 'on' or 'off'"
+	@echo ""
+	@exit 1
+endif
+	@echo "Setting SSE2 flag to default value 'on'... (use SSE2=on or SSE2=off)"
+endif
 endif
 
 # pixman compilation and linking
-$(CFG)/%.obj: %.c
-	@mkdir -p $(CFG)
+$(CFG_VAR)/%.obj: %.c
+	@mkdir -p $(CFG_VAR)
 	@$(CC) -c $(CFLAGS) -Fo"$@" $<
 
-$(CFG)/$(LIBRARY).lib: $(OBJECTS)
+$(CFG_VAR)/$(LIBRARY).lib: $(OBJECTS)
 	lib -NOLOGO -OUT:$@ $(OBJECTS) || exit 0
 
 pixman-combine32.c: combine.inc pixman-combine32.h combine.pl
@@ -101,5 +135,5 @@ pixman-combine64.h: combine.h.inc combine.pl
 	perl ./combine.pl 16 < $< > $@ || ($(RM) $@; exit 1)
 
 clean_r:
-	@rm -f $(CFG)/*.obj $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk || exit 0
+	@rm -f $(CFG_VAR)/*.obj $(CFG_VAR)/*.lib $(CFG_VAR)/*.pdb $(CFG)/*.ilk || exit 0
 	@rm -f $(CFG)/*.obj $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk pixman-combine32.c pixman-combine64.c || exit 0
commit ed862f1b2f62ee27884b9b429c54162039f3cb10
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Thu Sep 4 16:21:08 2008 -0400

    Make sure pixman-combine{32,64}.h are disted

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index b9ce896..399fb7d 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -11,7 +11,9 @@ libpixman_1_la_SOURCES =		\
 	pixman-private.h		\
 	pixman-image.c			\
 	pixman-combine32.c		\
+	pixman-combine32.h		\
 	pixman-combine64.c		\
+	pixman-combine64.h		\
 	pixman-compose.c		\
 	pixman-compose-accessors.c	\
 	pixman-pict.c			\