VS 2010 build

This commit is contained in:
Thorvald Natvig 2010-08-09 01:06:46 +02:00
parent a34f73a54e
commit dac82c9994
3 changed files with 5 additions and 5 deletions

@ -1 +1 @@
Subproject commit f504ca3a0b8b4b500e709a0b79cf806714f1342f
Subproject commit bb4f63f4a077814ab79b66b47fdad5944463248c

View File

@ -34,8 +34,8 @@
#include <string>
#include <map>
#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 {

View File

@ -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 {