From 0afa6c53936d0dd5bc22c3b67693c3a71754e986 Mon Sep 17 00:00:00 2001 From: acspike Date: Fri, 5 May 2006 18:46:24 +0000 Subject: [PATCH] whiteboard on windows nobody else was committing this ;-) --- Makefile.mingw | 2 ++ Makefile.mingw.common | 3 ++- src/make.exclude | 27 ++++++++++++++++++--------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Makefile.mingw b/Makefile.mingw index 9be387a55..ba437d40d 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -69,6 +69,7 @@ dist-strip: dist strip inkscape$(S)perl58.dll strip inkscape$(S)python24.dll strip inkscape$(S)liblcms-1.dll + strip inkscape$(S)libloudmouth-1-0.dll -$(RM) inkscape$(S)gdb.exe dist: generated required @@ -120,6 +121,7 @@ dist: generated required $(CP) $(GTKDOS)$(S)bin$(S)libintl-2.dll inkscape$(S)intl.dll $(CP) $(GTKDOS)$(S)bin$(S)popt1.dll inkscape $(CP) $(GTKDOS)$(S)bin$(S)liblcms-1.dll inkscape + $(CP) $(GTKDOS)$(S)bin$(S)libloudmouth-1-0.dll inkscape # # PERL # diff --git a/Makefile.mingw.common b/Makefile.mingw.common index f7032d33e..24afb1bfb 100644 --- a/Makefile.mingw.common +++ b/Makefile.mingw.common @@ -148,7 +148,7 @@ CFLAGS = -O3 -g -Wall -mms-bitfields -DVERSION=$(VERSION) \ ####### 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: @@ -209,6 +209,7 @@ $(GTK)/bin/libxml2.dll \ $(GTK)/lib/iconv.lib \ -lfreetype.dll -lfontconfig.dll \ -llcms.dll \ +$(GTK)/bin/libloudmouth-1-0.dll \ -lpng -lpopt $(GTK)/lib/zdll.lib \ -lgc -mwindows -lws2_32 -lintl diff --git a/src/make.exclude b/src/make.exclude index 543320c49..ccd19dc82 100644 --- a/src/make.exclude +++ b/src/make.exclude @@ -57,15 +57,24 @@ io/streamtest.cpp # For the moment, DO NOT remove these from cvs # until those files compile everywhere ############################################### -dialogs/whiteboard-connect-dialog.cpp -dialogs/whiteboard-common-dialog.cpp -dialogs/whiteboard-sharewithchat-dialog.cpp -dialogs/whiteboard-sharewithuser-dialog.cpp -jabber_whiteboard -ui/dialog/session-player.cpp -ui/dialog/whiteboard-connect.cpp -ui/dialog/whiteboard-sharewithchat.cpp -ui/dialog/whiteboard-sharewithuser.cpp +# Uncomment the following to build with Loudmouth +############################################### +#dialogs/whiteboard-connect-dialog.cpp +#dialogs/whiteboard-common-dialog.cpp +#dialogs/whiteboard-sharewithchat-dialog.cpp +#dialogs/whiteboard-sharewithuser-dialog.cpp +#jabber_whiteboard +#ui/dialog/session-player.cpp +#ui/dialog/whiteboard-connect.cpp +#ui/dialog/whiteboard-sharewithchat.cpp +#ui/dialog/whiteboard-sharewithuser.cpp +############################################### +#Uncomment the following to build with Pedro +############################################### +jabber_whiteboard/pedroxmpp.h +jabber_whiteboard/pedrodom.h +jabber_whiteboard/pedroxmpp.cpp +jabber_whiteboard/pedrodom.cpp ############################################### # Various test harnesses in removeoverlap -- 2.39.5