whiteboard on windows

nobody else was committing this ;-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 9be387a553a068e1a37f5afa7ba780485b3ed36b..ba437d40da06c8e77fc06702af30f5af42d153d2 100644 (file)
--- 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 f7032d33e4f934015bfa29a251b3eb53bab1fe81..24afb1bfb5fd58a3e8ed4dd3fece8fc7f8020fc0 100644 (file)
--- 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 543320c49f810cd5cec52ec1f087f954fec79a57..ccd19dc828fc1ceb62bc6b53f8fd5f4eb3d12c0c 100644 (file)
--- 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