diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index eb60bf387cdf704c1fc6717917022ed9dcd05822..1f5b2d885e9385efdbe76c556edb8bfe35fd34a1 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
####### file manipulation programs
CP = cp
####### file manipulation programs
CP = cp
-RMDIR = rm -rf
+RMDIR = rm -rf
MKDIR = mkdir
MKDIR = mkdir
-CPDIR = cp -rf
+CPDIR = cp -rf
MSGFMT = msgfmt
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)
RMREC1 = |xargs $(RM)
RMDIRREC = find ./inkscape -type d -name
RMDIRREC1 = |xargs $(RMDIR)
# NATIVE COMPILER SETTINGS
##########################################################################
# NATIVE COMPILER SETTINGS
##########################################################################
-CC = mingw32-gcc
-CXX = mingw32-g++
+CC = i686-pc-mingw32-gcc
+CXX = i686-pc-mingw32-g++
AS = as
AS = as
-AR = mingw32-ar
+AR = ar
OBJCOPY = objcopy
RANLIB = ranlib
WINDRES = windres
OBJCOPY = objcopy
RANLIB = ranlib
WINDRES = windres
S = $(BSLASH)
####### escape character for echo
S = $(BSLASH)
####### escape character for echo
-E =
+E =
####### file manipulation programs
CP = copy
####### file manipulation programs
CP = copy
endif
MKDIR = mkdir
CPDIR = xcopy /e /i
endif
MKDIR = mkdir
CPDIR = xcopy /e /i
-RMREC = cd inkscape & $(RM) /s /q
+RMREC = cd inkscape & $(RM) /s /q
RMREC1 = & cd ..
RMREC1 = & cd ..
-RMDIRREC = cd inkscape & $(RMDIR) /s
+RMDIRREC = cd inkscape & $(RMDIR) /s
RMDIRREC1 = & cd ..
####### Where is your GTK directory?
RMDIRREC1 = & cd ..
####### Where is your GTK directory?
+ifndef GTK
GTK=c:/gtk28
GTK=c:/gtk28
+endif
####### Same thing, DOS style
####### Same thing, DOS style
+ifndef GTKDOS
GTKDOS=c:\gtk28
GTKDOS=c:\gtk28
+endif
####### Command to process .po files --> .mo
MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt
####### change me!!
####### Command to process .po files --> .mo
MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt
####### change me!!
-DTG := 20050626
+DTG := 200600801
endif
##########################################################################
endif
##########################################################################
###### VERSION NUMBER
###### VERSION NUMBER
-# VERSION_NR = 0.41+devel
+# VERSION_NR = 0.45+devel
# VERSION = \"$(VERSION_NR)-${DTG}\"
# VERSION = \"$(VERSION_NR)-${DTG}\"
-VERSION_NR = 0.43+0.44pre3
+VERSION_NR = 0.45+devel
VERSION = \"$(VERSION_NR)\"
####### the XP_WIN def is necessary for libjs.a
VERSION = \"$(VERSION_NR)\"
####### the XP_WIN def is necessary for libjs.a
-CFLAGS = -g -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \
+CFLAGS = -Wall -g -O3 -mms-bitfields -DVERSION=$(VERSION) \
-DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H
####### Inkboard abilities.
####### You must 'make -f Makefile.mingw clean' when turning this on or off
-DXP_WIN -D_INTL_REDIRECT_INLINE -DHAVE_CONFIG_H
####### Inkboard abilities.
####### You must 'make -f Makefile.mingw clean' when turning this on or off
-#CFLAGS += -DWITH_INKBOARD
+CFLAGS += -DWITH_INKBOARD
####### IMPLICIT RULES
.cpp.o:
####### IMPLICIT RULES
.cpp.o:
####### Our Gtk libs
####### Our Gtk libs
-####### we removed the '-Wl,--enable-runtime-pseudo-reloc' option, as
-####### it proved to be very dangerous
-####### with Gtk::TreeViewColumn
GTKLIB = -L$(GTK)/lib \
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 \
-latkmm-1.6 -lpangomm-1.4 -lsigc-2.0 \
-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 \
GTKLIB = -L$(GTK)/lib \
-lgtkmm-2.4 -lgdkmm-2.4 -lglibmm-2.4 \
-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
+-lgdk_pixbuf-2.0 \
+-lpangocairo-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lpango-1.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)
####### For PERL
####### (note: perl's config.h has some nested comments)
PYTHONLIB = -L$(GTK)/python/libs -lpython24
#PYTHONLIB = -L$(GTK)/python/libs/libpython24.a
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 \
# To enable loudmouth uncomment and move this line below
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 \
# To enable loudmouth uncomment and move this line below
-#-lloudmouth-1.dll -lssl -lcrypto
LIBS = $(GTKLIB) $(PERLLIB) $(PYTHONLIB) \
$(GTK)/bin/libxml2.dll \
$(GTK)/lib/iconv.lib \
-lfreetype.dll -lfontconfig.dll \
-llcms.dll \
LIBS = $(GTKLIB) $(PERLLIB) $(PYTHONLIB) \
$(GTK)/bin/libxml2.dll \
$(GTK)/lib/iconv.lib \
-lfreetype.dll -lfontconfig.dll \
-llcms.dll \
+-lloudmouth-1.dll -lssl -lcrypto \
-lpng -lpopt $(GTK)/lib/zdll.lib \
-lpng -lpopt $(GTK)/lib/zdll.lib \
--lgc -mwindows -lws2_32 -lintl
+-lgc -mwindows -lws2_32 -lintl -lm
##########################################################################
##########################################################################