From dac82c99943a11cbe6e52da45da76f30c6d2ddbf Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Mon, 9 Aug 2010 01:06:46 +0200 Subject: [PATCH] VS 2010 build --- celt-0.8.0-src | 2 +- plugins/mumble_plugin.h | 4 ++-- src/murmur/murmur.pro | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/celt-0.8.0-src b/celt-0.8.0-src index f504ca3a0..bb4f63f4a 160000 --- a/celt-0.8.0-src +++ b/celt-0.8.0-src @@ -1 +1 @@ -Subproject commit f504ca3a0b8b4b500e709a0b79cf806714f1342f +Subproject commit bb4f63f4a077814ab79b66b47fdad5944463248c diff --git a/plugins/mumble_plugin.h b/plugins/mumble_plugin.h index 23240b517..8bf120e6f 100644 --- a/plugins/mumble_plugin.h +++ b/plugins/mumble_plugin.h @@ -34,8 +34,8 @@ #include #include -#define MUMBLE_PLUGIN_MAGIC 0xd63ab7ef -#define MUMBLE_PLUGIN_MAGIC_2 0xd63ab7fe +#define MUMBLE_PLUGIN_MAGIC 0xd63ab7f0 +#define MUMBLE_PLUGIN_MAGIC_2 0xd63ab7ff #define MUMBLE_PLUGIN_VERSION 2 typedef struct _MumblePlugin { diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro index bf29e818e..aa8b81b57 100644 --- a/src/murmur/murmur.pro +++ b/src/murmur/murmur.pro @@ -23,7 +23,7 @@ PRECOMPILED_HEADER = murmur_pch.h CONFIG *= ice } -!CONFIG(no-dbus) { +!CONFIG(no-dbus):!win32 { CONFIG *= dbus } @@ -87,7 +87,7 @@ ice { win32 { INCLUDEPATH *= /dev/Ice/include - QMAKE_LIBDIR *= /dev/Ice/lib + QMAKE_LIBDIR *= /dev/Ice/lib/vc100 } macx {