Update Makefile.win32 to make it work again.

diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32
index 208bb2e3903c5ed09d0b0c4f56486f2b95abee0f..388bee23afc82b1c04e4029a1187bbe9970c1b03 100644 (file)
--- 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 75c5d3aa1a966b857594df40557ae8ade6ef2891..b53630caedeccfbed15e09e5aecebfcb42b45579 100644 (file)
--- 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 8de922fcc171edf046f1cf55e98ef39a8e80222c..d2ce26fe3cf5c0bcdb829038f6d3ae158b18dbfd 100644 (file)
--- 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 898474f0a487bfe2d989c1e37baea7b37223ef82..6414b01a502faa8be286af19cb4c1d3bca29fba2 100644 (file)
--- 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 1797caf267cd62eadbe97441016f000e781f3819..dd666b4120b40140489150b25fa05b471f4086bb 100644 (file)
--- 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 c7439482f0173ff885eb8a406ec6ad1ad9a2deb6..bcda9fe85a27397a166e09fa84a04b9b4975f7de 100644 (file)
--- 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 8c4a8ff255b4242cc70797d1eccde7232af637c0..b940d76ec477d9f56a5c3638a49628beef3eb386 100644 (file)
--- 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 06d6ef981948efcfaa962e5f97097dfb2cc17bdf..a3b591673ad43a4e86c65ed026799340a39ad7d6 100644 (file)
--- 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 667f1f023b7e8c025de2c85ebf36e8524d721107..6a612272ae75d68bbb68e8c5080a39dab2aa0185 100644 (file)
--- 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