Give SPNamedView a SnapManager instance and use it for all management of snapping...

[inkscape.git] / Makefile.mingw.common

diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index c849a431770eeb476d6e655ac0f519f16f10ad83..60177a4c08c9343c71e6ffb4a0e57678584da62e 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
@@ -45,6 +45,7 @@ CC      = i686-pc-mingw32-gcc
 CXX     = i686-pc-mingw32-g++
 AS      = i686-pc-mingw32-as
 AR      = i686-pc-mingw32-ar
+OBJCOPY = i686-pc-mingw32-objcopy
 RANLIB  = i686-pc-mingw32-ranlib
 WINDRES = i686-pc-mingw32-windres
 LD      = i686-pc-mingw32-ld
@@ -86,6 +87,7 @@ CC      = mingw32-gcc
 CXX     = mingw32-g++
 AS      = as
 AR      = mingw32-ar
+OBJCOPY = objcopy
 RANLIB  = ranlib
 WINDRES = windres
 DLLWRAP = dllwrap
@@ -142,13 +144,12 @@ VERSION = \"$(VERSION_NR)\"
 
 ####### the XP_WIN def is necessary for libjs.a
 CFLAGS = -O3 -g -Wall -mms-bitfields -DVERSION=$(VERSION) \
--DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H
+-DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H -DENABLE_LCMS
 
 ####### Inkboard abilities.
 ####### You must 'make -f Makefile.mingw clean' when turning this on or off
 #CFLAGS += -DWITH_INKBOARD
 
-
 ####### IMPLICIT RULES
 .cpp.o:
        $(CXX) $(CFLAGS) $(INC) -c -o $@ $<
@@ -207,6 +208,7 @@ LIBS = $(GTKLIB) $(PERLLIB) $(PYTHONLIB) \
 $(GTK)/bin/libxml2.dll \
 $(GTK)/lib/iconv.lib   \
 -lfreetype.dll -lfontconfig.dll  \
+-llcms.dll \
 -lpng -lpopt $(GTK)/lib/zdll.lib \
 -lgc -mwindows -lws2_32 -lintl