changeset 29401:bc2760c74a79

Fix win32 build
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 18 Feb 2010 19:29:11 +0000
parents dd3c5b3dd3e0
children d932f43cde86 185677f47825 1e8dc177415e ee3226c6092f
files libpurple/Makefile.mingw libpurple/win32/global.mak
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.mingw	Thu Feb 18 17:08:35 2010 +0000
+++ b/libpurple/Makefile.mingw	Thu Feb 18 19:29:11 2010 +0000
@@ -48,13 +48,8 @@
 			idle.c \
 			imgstore.c \
 			log.c \
-			media/backend-fs2.c \
-			media/backend-iface.c \
-			media/candidate.c \
-			media/codec.c \
-			media/enum-types.c \
-			media/media.c \
 			mediamanager.c \
+			media.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
--- a/libpurple/win32/global.mak	Thu Feb 18 17:08:35 2010 +0000
+++ b/libpurple/win32/global.mak	Thu Feb 18 19:29:11 2010 +0000
@@ -12,7 +12,7 @@
 WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11-daa1
-GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
+GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
 LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.6.30