diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2014-10-03 11:14:09 -0400 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2014-10-03 11:14:09 -0400 |
| commit | 7a979bb42a8019effcf6001a338070ae29011215 (patch) | |
| tree | 7ca6aa4bfe5c752b290f6e6205a866d5b184acbb /libpurple/win32 | |
| parent | 9afbbdf5cd9ee3cfefa677914eb2068e6b9b3a80 (diff) | |
| download | pidgin-7a979bb42a8019effcf6001a338070ae29011215.tar.gz | |
Fix merge issues from c3e87cb60c02
Diffstat (limited to 'libpurple/win32')
| -rw-r--r-- | libpurple/win32/global.mak | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak index be77bc49f7..dd1f90286e 100644 --- a/libpurple/win32/global.mak +++ b/libpurple/win32/global.mak @@ -75,6 +75,7 @@ GCCWARNINGS ?= -Waggregate-return -Wcast-align -Wdeclaration-after-statement -We CC_HARDENING_OPTIONS ?= -Wstack-protector -fwrapv -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security -fstack-protector-all --param ssp-buffer-size=1 LD_HARDENING_OPTIONS ?= -Wl,--dynamicbase -Wl,--nxcompat +TAG := @$(PURPLE_TOP)/tag.sh # parse the version number from the configure.ac file if it is newer #m4_define([purple_major_version], [2]) @@ -116,18 +117,45 @@ DLL_LD_FLAGS += -Wl,--enable-auto-image-base -Wl,--enable-auto-import $(LD_HARDE ifeq "$(origin CC)" "default" CC := gcc.exe endif -GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt +# comment out the next line to make output more verbose +CC := $(TAG) "auto" $(CC) + +GMSGFMT ?= $(GETTEXT_TOP)/bin/msgfmt MAKENSIS ?= makensis.exe PERL ?= perl WINDRES ?= windres STRIP ?= strip -INTLTOOL_MERGE ?= $(WIN32_DEV_TOP)/intltool_0.40.4-1_win32/bin/intltool-merge +INTLTOOL_MERGE ?= $(INTLTOOL_TOP)/bin/intltool-merge MONO_SIGNCODE ?= signcode GPG_SIGN ?= gpg +GLIB_GENMARSHAL ?= $(GTK_BIN)/glib-genmarshal +GLIB_MKENUMS ?= $(GTK_BIN)/glib-mkenums PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak MINGW_MAKEFILE := Makefile.mingw +MAKE_at := @ + +USE_VV ?= 1 + +ifeq "$(USE_VV)" "1" +VV_LIBS := \ + -lgstreamer-0.10 \ + -lgstvideo-0.10 \ + -lgstinterfaces-0.10 \ + -lfarstream-0.1 +VV_INCLUDE_PATHS := \ + -I$(GSTREAMER_TOP)/include/gstreamer-0.10 \ + -I$(GSTREAMER_TOP)/include/farstream-0.1 \ + -I$(LIBXML2_TOP)/include/libxml2 +VV_LIB_PATHS := \ + -L$(GSTREAMER_TOP)/lib +DEFINES += -DUSE_GSTREAMER -DUSE_VV +else +VV_LIBS := +VV_INCLUDE_PATHS := +VV_LIB_PATHS := +endif INSTALL_PIXMAPS ?= 1 INSTALL_SSL_CERTIFICATES ?= 1 |