diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index 70a2bcd9d6a84c6527e3b44d688a70f694af2371..5afa38dde3130c7fefe1034058425487e1464c27 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
####### file manipulation programs
CP = cp
-RMDIR = rm -rf
+RMDIR = rm -rf
MKDIR = mkdir
-CPDIR = cp -rf
+CPDIR = cp -rf
MSGFMT = msgfmt
-RMREC = find ./inkscape -type f -name
+RMREC = find ./inkscape -type f -name
RMREC1 = |xargs $(RM)
RMDIRREC = find ./inkscape -type d -name
RMDIRREC1 = |xargs $(RMDIR)
S = $(BSLASH)
####### escape character for echo
-E =
+E =
####### file manipulation programs
CP = copy
endif
MKDIR = mkdir
CPDIR = xcopy /e /i
-RMREC = cd inkscape & $(RM) /s /q
+RMREC = cd inkscape & $(RM) /s /q
RMREC1 = & cd ..
-RMDIRREC = cd inkscape & $(RMDIR) /s
+RMDIRREC = cd inkscape & $(RMDIR) /s
RMDIRREC1 = & cd ..
####### Where is your GTK directory?
VERSION = \"$(VERSION_NR)\"
####### the XP_WIN def is necessary for libjs.a
-CFLAGS = -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \
+CFLAGS = -Wall -O3 -g -mms-bitfields -DVERSION=$(VERSION) \
-DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H
####### Inkboard abilities.
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0 \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 \
-lgdk_pixbuf-2.0 -lm -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.0 \
--lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0
+-lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lcairo
####### For PERL
####### (note: perl's config.h has some nested comments)
PYTHONLIB = -L$(GTK)/python/libs -lpython24
#PYTHONLIB = -L$(GTK)/python/libs/libpython24.a
-####### remove -DLIBXML_STATIC
+####### remove -DLIBXML_STATIC
INC = -I. -I.. -I../.. -I../cxxtest $(GTKINC) -I$(GTK)/include \
$(PERLINC) $(PYTHONINC) -I$(GTK)/include/loudmouth-1.0 \
-I$(GTK)/include/libxml2 -I$(GTK)/include/freetype2 \