Bug 882968 - Clean up and move DEFINES and friends to moz.build in comm-central - Part 2: mailnews/mapi files r=cranmer for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 03 Sep 2014 22:33:54 +0100
changeset 20916 77c907e1b6bac0df293ad03cd8d96ed52c048957
parent 20915 2a2d2bf985dd99e04956f923a941876b85c9f7df
child 20917 7f8be51ebb195bb4380bae2b882b043aa18590ea
push id1259
push usermbanner@mozilla.com
push dateFri, 28 Nov 2014 16:21:42 +0000
treeherdercomm-beta@219e12aa22c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscranmer
bugs882968
Bug 882968 - Clean up and move DEFINES and friends to moz.build in comm-central - Part 2: mailnews/mapi files r=cranmer for a CLOSED TREE
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/build/moz.build
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mapi/mapihook/src/moz.build
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -16,10 +16,8 @@ USE_STATIC_LIBS = 1
 
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
-
-DEFINES	+= -DUNICODE -D_UNICODE
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -9,9 +9,13 @@ SOURCES += [
     'MapiDll.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 
 OS_LIBS += [
     'ole32',
 ]
+
+DEFINES['UNICODE'] = True
+DEFINES['_UNICODE'] = True
+
 DEFFILE	= SRCDIR + '/Mapi32.def'
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -30,18 +30,16 @@ EMBED_MANIFEST_AT = 2
 CSRCS += \
   dlldata.c \
   msgMapi_i.c \
   msgMapi_p.c \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400
-
 $(MIDL_GENERATED_FILES): done_gen
 
 done_gen: msgMapi.idl
 	$(RM) $(SRCDIR_CSRCS)
 	$(MIDL) $(MIDL_FLAGS) $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
 	touch $@
 
 export:: done_gen
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -5,9 +5,15 @@
 
 LIBRARY_NAME = 'MapiProxy'
 
 FORCE_SHARED_LIB = True
 
 OS_LIBS += [
     'rpcrt4',
 ]
+
+for var in ('REGISTER_PROXY_DLL', 'UNICODE', '_UNICODE'):
+    DEFINES[var] = True
+
+DEFINES['_WIN32_WINNT'] = '0x400'
+
 DEFFILE = SRCDIR + '/MapiProxy.def'
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -8,10 +8,8 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 CSRCS += ../build/msgMapi_i.c
 
 include $(topsrcdir)/config/rules.mk
-
-DEFINES	+= -DUNICODE -D_UNICODE
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -17,8 +17,11 @@ SOURCES += [
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
 else:
     FINAL_LIBRARY = 'xul'
 
 OS_LIBS += [
     'ole32',
 ]
+
+DEFINES['UNICODE'] = True
+DEFINES['_UNICODE'] = True