X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile.mingw.common;h=ba5e6739bf79eea5e9c9ffde424dfd9e8fef8d1a;hb=24c6ddb693cb37e6e68798b6fff862d5968c5891;hp=24afb1bfb5fd58a3e8ed4dd3fece8fc7f8020fc0;hpb=0afa6c53936d0dd5bc22c3b67693c3a71754e986;p=inkscape.git

diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index 24afb1bfb..ba5e6739b 100644
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
@@ -60,11 +60,11 @@ E = /
 
 ####### 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)
@@ -83,10 +83,10 @@ else
 # NATIVE COMPILER SETTINGS
 ##########################################################################
 
-CC      = mingw32-gcc
-CXX     = mingw32-g++
+CC      = i686-pc-mingw32-gcc
+CXX     = i686-pc-mingw32-g++
 AS      = as
-AR      = mingw32-ar
+AR      = ar
 OBJCOPY = objcopy
 RANLIB  = ranlib
 WINDRES = windres
@@ -97,7 +97,7 @@ DLLTOOL = dlltool
 S = $(BSLASH)
 
 ####### escape character for echo
-E = 
+E =
 
 ####### file manipulation programs
 CP = copy
@@ -112,22 +112,26 @@ RM    = del
 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?
-GTK=c:/gtk28
+ifndef GTK
+GTK=c:/gtk210
+endif
 
 ####### Same thing, DOS style
-GTKDOS=c:\gtk28
+ifndef GTKDOS
+GTKDOS=c:\gtk210
+endif
 
 ####### Command to process .po files --> .mo
 MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt
 
 ####### change me!!
-DTG := 20050626
+DTG := 20070111
 
 endif
 ##########################################################################
@@ -136,19 +140,20 @@ endif
 
 
 ###### VERSION NUMBER
-# VERSION_NR = 0.41+devel
+# VERSION_NR = 0.45+devel
 # VERSION = \"$(VERSION_NR)-${DTG}\"
 
-VERSION_NR = 0.43+devel
+VERSION_NR = 0.45+devel
 VERSION = \"$(VERSION_NR)\"
 
 ####### the XP_WIN def is necessary for libjs.a
-CFLAGS = -O3 -g -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
-CFLAGS += -DWITH_INKBOARD
+CFLAGS += -DWITH_INKBOARD -DHAVE_SSL -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }"
+
 
 ####### IMPLICIT RULES
 .cpp.o:
@@ -165,12 +170,12 @@ CFLAGS += -DWITH_INKBOARD
 # INCLUDES AND LIBRARIES
 ##########################################################################
 
-GTKINC = -DGLIBMM_DLL \
--I$(GTK)/include/glibmm-2.4 -I$(GTK)/lib/glibmm-2.4/include \
+GTKINC = -I$(GTK)/include/glibmm-2.4 -I$(GTK)/lib/glibmm-2.4/include \
 -I$(GTK)/include/gtkmm-2.4  -I$(GTK)/lib/gtkmm-2.4/include \
 -I$(GTK)/include/gdkmm-2.4  -I$(GTK)/lib/gdkmm-2.4/include \
 -I$(GTK)/include/pangomm-1.4 \
 -I$(GTK)/include/atkmm-1.6 -I$(GTK)/include/cairo  \
+-I$(GTK)/include/cairomm-1.0  \
 -I$(GTK)/include/sigc++-2.0 -I$(GTK)/lib/sigc++-2.0/include \
 -I$(GTK)/include/gtk-2.0 -I$(GTK)/lib/gtk-2.0/include \
 -I$(GTK)/include/atk-1.0 -I$(GTK)/include/pango-1.0 \
@@ -178,15 +183,13 @@ GTKINC = -DGLIBMM_DLL \
 
 
 ####### 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 -lloudmouth-1 \
+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)
@@ -198,20 +201,21 @@ PYTHONINC = -I$(GTK)/python/include
 PYTHONLIB = -L$(GTK)/python/libs -lpython24
 #PYTHONLIB = -L$(GTK)/python/libs/libpython24.a
 
-####### remove -DLIBXML_STATIC 
-INC = -I. -I.. -I../.. $(GTKINC) -I$(GTK)/include \
-$(PERLINC) $(PYTHONINC) -I$(GTK)/include/loudmouth-1.0 \
+####### remove -DLIBXML_STATIC
+INC = -I. -I.. -I../.. -I../cxxtest $(GTKINC) -I$(GTK)/include \
+$(PERLINC) $(PYTHONINC) \
 -I$(GTK)/include/libxml2 -I$(GTK)/include/freetype2 \
 
 
+# To enable loudmouth uncomment and move this line below
 LIBS = $(GTKLIB) $(PERLLIB) $(PYTHONLIB) \
 $(GTK)/bin/libxml2.dll \
 $(GTK)/lib/iconv.lib	\
 -lfreetype.dll -lfontconfig.dll  \
 -llcms.dll \
-$(GTK)/bin/libloudmouth-1-0.dll \
+-lssl -lcrypto \
 -lpng -lpopt $(GTK)/lib/zdll.lib \
--lgc -mwindows -lws2_32 -lintl
+-lgc -mwindows -lws2_32 -lintl -lm
 
 
 ##########################################################################