pixman: Branch 'master'
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Mon Jul 20 16:32:41 PDT 2009
pixman/Makefile.win32 | 57 +++++++++++++++++++++-------------------
pixman/pixman-bits-image.c | 2 +
pixman/pixman-fast-path.c | 2 +
pixman/pixman-general.c | 2 +
pixman/pixman-gradient-walker.c | 2 +
pixman/pixman-implementation.c | 2 +
pixman/pixman-linear-gradient.c | 2 +
pixman/pixman-radial-gradient.c | 2 +
pixman/pixman-solid-fill.c | 2 +
9 files changed, 46 insertions(+), 27 deletions(-)
New commits:
commit 2356ba38fd0c0002be4484adb8ca51de32b2ff81
Author: Miha Vrhovnik <miha.vrhovnik at cordia.si>
Date: Mon Jul 20 19:30:59 2009 -0400
Update Makefile.win32 to make it work again.
diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32
index 208bb2e..388bee2 100644
--- a/pixman/Makefile.win32
+++ b/pixman/Makefile.win32
@@ -29,27 +29,30 @@ else
CFLAGS += -O2
endif
-SOURCES = \
- pixman-image.c \
- pixman-access.c \
- pixman-access-accessors.c \
+SOURCES = \
+ pixman-image.c \
+ pixman-access.c \
+ pixman-access-accessors.c \
pixman-region16.c \
pixman-region32.c \
- pixman-compose.c \
- pixman-compose-accessors.c \
- pixman-combine32.c \
- pixman-combine64.c \
- pixman-pict.c \
- pixman-source.c \
- pixman-transformed.c \
- pixman-transformed-accessors.c \
- pixman-utils.c \
- pixman-edge.c \
+ pixman-combine32.c \
+ pixman-combine64.c \
+ pixman-utils.c \
+ pixman-edge.c \
pixman-edge-accessors.c \
- pixman-trap.c \
- pixman-compute-region.c \
- pixman-timer.c \
- pixman-matrix.c \
+ pixman-trap.c \
+ pixman-timer.c \
+ pixman-matrix.c \
+ pixman-gradient-walker.c \
+ pixman-linear-gradient.c \
+ pixman-radial-gradient.c \
+ pixman-bits-image.c \
+ pixman.c \
+ pixman-cpu.c \
+ pixman-fast-path.c \
+ pixman-implementation.c \
+ pixman-solid-fill.c \
+ pixman-general.c \
$(NULL)
# MMX compilation flags
@@ -125,16 +128,16 @@ $(CFG_VAR)/%.obj: %.c
$(CFG_VAR)/$(LIBRARY).lib: $(OBJECTS)
lib -NOLOGO -OUT:$@ $(OBJECTS) || exit 0
-pixman-combine32.c: combine.inc pixman-combine32.h combine.pl
- perl ./combine.pl 8 < $< > $@ || ($(RM) $@; exit 1)
-pixman-combine32.h: combine.h.inc combine.pl
- perl ./combine.pl 8 < $< > $@ || ($(RM) $@; exit 1)
+pixman-combine32.c: pixman-combine.c.template pixman-combine32.h make-combine.pl
+ perl ./make-combine.pl 8 < $< > $@ || ($(RM) $@; exit 1)
+pixman-combine32.h: pixman-combine.h.template make-combine.pl
+ perl ./make-combine.pl 8 < $< > $@ || ($(RM) $@; exit 1)
-pixman-combine64.c: combine.inc pixman-combine64.h combine.pl
- perl ./combine.pl 16 < $< > $@ || ($(RM) $@; exit 1)
-pixman-combine64.h: combine.h.inc combine.pl
- perl ./combine.pl 16 < $< > $@ || ($(RM) $@; exit 1)
+pixman-combine64.c: pixman-combine.c.template pixman-combine64.h make-combine.pl
+ perl ./make-combine.pl 16 < $< > $@ || ($(RM) $@; exit 1)
+pixman-combine64.h: pixman-combine.h.template make-combine.pl
+ perl ./make-combine.pl 16 < $< > $@ || ($(RM) $@; exit 1)
clean_r:
@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
+ @rm -f $(CFG)/*.obj $(CFG)/*.lib $(CFG)/*.pdb $(CFG)/*.ilk pixman-combine32.c pixman-combine64.c pixman-combine64.c pixman-combine64.h || exit 0
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index 75c5d3a..b53630c 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -25,7 +25,9 @@
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include "pixman-private.h"
diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 8de922f..d2ce26f 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -23,7 +23,9 @@
* Author: Keith Packard, SuSE, Inc.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <string.h>
#include "pixman-private.h"
#include "pixman-combine32.h"
diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 898474f..6414b01 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -25,7 +25,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/pixman/pixman-gradient-walker.c b/pixman/pixman-gradient-walker.c
index 1797caf..dd666b4 100644
--- a/pixman/pixman-gradient-walker.c
+++ b/pixman/pixman-gradient-walker.c
@@ -23,7 +23,9 @@
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "pixman-private.h"
void
diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
index c743948..bcda9fe 100644
--- a/pixman/pixman-implementation.c
+++ b/pixman/pixman-implementation.c
@@ -21,7 +21,9 @@
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdlib.h>
#include "pixman-private.h"
diff --git a/pixman/pixman-linear-gradient.c b/pixman/pixman-linear-gradient.c
index 8c4a8ff..b940d76 100644
--- a/pixman/pixman-linear-gradient.c
+++ b/pixman/pixman-linear-gradient.c
@@ -24,7 +24,9 @@
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdlib.h>
#include "pixman-private.h"
diff --git a/pixman/pixman-radial-gradient.c b/pixman/pixman-radial-gradient.c
index 06d6ef9..a3b5916 100644
--- a/pixman/pixman-radial-gradient.c
+++ b/pixman/pixman-radial-gradient.c
@@ -26,7 +26,9 @@
* SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdlib.h>
#include <math.h>
#include "pixman-private.h"
diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index 667f1f0..6a61227 100644
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -21,7 +21,9 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "pixman-private.h"
static void
More information about the xorg-commit
mailing list