1 Index: src/libgdl/gdl-win32.c
2 ===================================================================
3 --- src/libgdl/gdl-win32.c (revision 20069)
4 +++ src/libgdl/gdl-win32.c (working copy)
11 /* Platform detection */
20 Index: src/libgdl/gdl-win32.h
21 ===================================================================
22 --- src/libgdl/gdl-win32.h (revision 20069)
23 +++ src/libgdl/gdl-win32.h (working copy)
25 #ifndef __INKSCAPE_GDL_WIN32_H__
26 #define __INKSCAPE_GDL_WIN32_H__
38 -#error "This file is only usable for Windows"
41 /* Platform detection */
42 gboolean is_os_vista();
46 #endif /* __INKSCAPE_GDL_WIN32_H__ */
47 Index: src/libgdl/Makefile_insert
48 ===================================================================
49 --- src/libgdl/Makefile_insert (revision 20069)
50 +++ src/libgdl/Makefile_insert (working copy)
53 libgdl/gdl-switcher.h \
54 libgdl/gdl-switcher.c \
55 + libgdl/gdl-win32.c \
56 + libgdl/gdl-win32.h \
57 libgdl/libgdltypebuiltins.h \
58 libgdl/libgdltypebuiltins.c \
59 libgdl/libgdlmarshal.h \
60 Index: src/extension/internal/win32.h
61 ===================================================================
62 --- src/extension/internal/win32.h (revision 20069)
63 +++ src/extension/internal/win32.h (working copy)
69 -#error "This file is only usable for Windows"
76 } /* namespace Extension */
77 } /* namespace Inkscape */
81 #endif /* __INKSCAPE_EXTENSION_INTERNAL_PRINT_WIN32_H__ */
82 Index: src/extension/internal/Makefile_insert
83 ===================================================================
84 --- src/extension/internal/Makefile_insert (revision 20069)
85 +++ src/extension/internal/Makefile_insert (working copy)
87 extension/internal/filter/filter-all.cpp \
88 extension/internal/filter/filter-file.cpp \
89 extension/internal/filter/filter.cpp \
90 - extension/internal/filter/filter.h
92 + extension/internal/filter/filter.h \
93 + extension/internal/win32.h \
94 + extension/internal/win32.cpp \
95 + extension/internal/emf-win32-print.h \
96 + extension/internal/emf-win32-print.cpp \
97 + extension/internal/emf-win32-inout.h \
98 + extension/internal/emf-win32-inout.cpp
99 \ No newline at end of file
100 Index: src/extension/internal/win32.cpp
101 ===================================================================
102 --- src/extension/internal/win32.cpp (revision 20069)
103 +++ src/extension/internal/win32.cpp (working copy)
110 #include <glib/gmem.h>
111 #include <libnr/nr-macros.h>
112 #include <libnr/nr-matrix.h>
114 } /* namespace Internal */
115 } /* namespace Extension */
116 } /* namespace Inkscape */
119 Index: src/Makefile.am
120 ===================================================================
121 --- src/Makefile.am (revision 20069)
122 +++ src/Makefile.am (working copy)
124 $(POPPLER_GLIB_CFLAGS) \
125 -DPOTRACE=\"potrace\" \
127 - -I$(top_srcdir)/cxxtest
128 + -I$(top_srcdir)/cxxtest \
131 include Makefile_insert
132 include application/Makefile_insert
133 Index: src/libnrtype/FontFactory.cpp
134 ===================================================================
135 --- src/libnrtype/FontFactory.cpp (revision 20069)
136 +++ src/libnrtype/FontFactory.cpp (working copy)
141 +#define PANGO_ENABLE_ENGINE
143 #include "FontFactory.h"
144 #include <libnrtype/font-instance.h>
146 Index: src/libnrtype/Layout-TNG-Input.cpp
147 ===================================================================
148 --- src/libnrtype/Layout-TNG-Input.cpp (revision 20069)
149 +++ src/libnrtype/Layout-TNG-Input.cpp (working copy)
151 * Released under GNU GPL, read the file 'COPYING' for more information
154 +#define PANGO_ENABLE_ENGINE
156 #include <gtk/gtkversion.h>
157 #include "Layout-TNG.h"
159 Index: src/libnrtype/FontInstance.cpp
160 ===================================================================
161 --- src/libnrtype/FontInstance.cpp (revision 20069)
162 +++ src/libnrtype/FontInstance.cpp (working copy)
167 +#define PANGO_ENABLE_ENGINE
172 Index: src/ui/dialog/Makefile_insert
173 ===================================================================
174 --- src/ui/dialog/Makefile_insert (revision 20069)
175 +++ src/ui/dialog/Makefile_insert (working copy)
177 ui/dialog/aboutbox.cpp \
178 ui/dialog/aboutbox.h \
179 ui/dialog/ocaldialogs.cpp \
180 - ui/dialog/ocaldialogs.h
181 + ui/dialog/ocaldialogs.h \
182 + ui/dialog/filedialogimpl-win32.h \
183 + ui/dialog/filedialogimpl-win32.cpp
185 ui/dialog/aboutbox.$(OBJEXT): inkscape_version.h
187 ===================================================================
188 --- src/main.cpp (revision 20069)
189 +++ src/main.cpp (working copy)
192 static int set_extensions_env()
194 - char *oldenv = getenv("PYTHONPATH");
195 + const char *oldenv = g_getenv("PYTHONPATH");
196 Glib::ustring tmp = INKSCAPE_EXTENSIONDIR;
197 if (oldenv != NULL) {
203 - setenv("PYTHONPATH", tmp.c_str(), 1);
204 + g_setenv("PYTHONPATH", tmp.c_str(), 1);
209 ===================================================================
210 --- configure.ac (revision 20069)
211 +++ configure.ac (working copy)
213 break], [gc_ok=no], [$gc_libs])
216 -if test "x$gc_ok" = "xyes"; then
217 +if test "x$gc_ok" = "xyes" && "x$cross_compiling" = "xno" ; then
218 AC_MSG_CHECKING([libgc version 6.4+])
225 - INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
226 + WIN32_CFLAGS="-mms-bitfields -DLIBXML_STATIC"
231 AC_MSG_RESULT([$platform_win32])
232 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
234 +AC_SUBST(WIN32_CFLAGS)
236 AC_MSG_CHECKING([for Solaris platform])
239 @@ -282,10 +284,10 @@
241 if test "x$with_xft" != "xno" ; then
242 dnl Test fontconfig package
243 - PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
244 + PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
245 if test "x$xft_ok" != "xyes"; then
247 - PKG_CHECK_MODULES(XFT, fontconfig, xft_ok=yes, xft_ok=no)
248 + PKG_CHECK_MODULES(XFT, xft, xft_ok=yes, xft_ok=no)
249 if test "x$xft_ok" != "xyes"; then
250 dnl Have to test xft presence
251 AC_CHECK_HEADER(X11/Xft/Xft.h, xft_ok=yes, xft_ok=no)