diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index 1f5b2d885e9385efdbe76c556edb8bfe35fd34a1..ba5e6739bf79eea5e9c9ffde424dfd9e8fef8d1a 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
####### Where is your GTK directory?
ifndef GTK
-GTK=c:/gtk28
+GTK=c:/gtk210
endif
####### Same thing, DOS style
ifndef GTKDOS
-GTKDOS=c:\gtk28
+GTKDOS=c:\gtk210
endif
####### Command to process .po files --> .mo
MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt
####### change me!!
-DTG := 200600801
+DTG := 20070111
endif
##########################################################################
####### 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:
# 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 \
####### remove -DLIBXML_STATIC
INC = -I. -I.. -I../.. -I../cxxtest $(GTKINC) -I$(GTK)/include \
-$(PERLINC) $(PYTHONINC) -I$(GTK)/include/loudmouth-1.0 \
+$(PERLINC) $(PYTHONINC) \
-I$(GTK)/include/libxml2 -I$(GTK)/include/freetype2 \
$(GTK)/lib/iconv.lib \
-lfreetype.dll -lfontconfig.dll \
-llcms.dll \
--lloudmouth-1.dll -lssl -lcrypto \
+-lssl -lcrypto \
-lpng -lpopt $(GTK)/lib/zdll.lib \
-lgc -mwindows -lws2_32 -lintl -lm