summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2023-12-07 02:18:49 +0000
committerThorsten Behrens <thorsten.behrens@allotropia.de>2023-12-07 03:20:26 +0100
commita5e825cc69f9c29d450607d9033682ec3a68b57e (patch)
tree2c0175ae6623cb87f5fb3e1a78582fa1a38fe57a
parent67b8ad26b868c6de69b0aa2d1f11ccf66cb1a2dd (diff)
More fixup Windows buiuld feature/windowsupdater
Change-Id: Ic5ffedbf57fa0f686b9ede193f61e47e7efe90ac
-rw-r--r--onlineupdate/StaticLibrary_updatehelper.mk8
-rw-r--r--onlineupdate/inc/nsAutoRef.h (renamed from onlineupdate/source/service/nsAutoRef.h)0
-rw-r--r--onlineupdate/inc/nsCharTraits.h (renamed from onlineupdate/source/service/nsCharTraits.h)0
-rw-r--r--onlineupdate/inc/nsUTF8Utils.h (renamed from onlineupdate/source/service/nsUTF8Utils.h)0
-rw-r--r--onlineupdate/inc/nsWindowsHelpers.h (renamed from onlineupdate/source/service/nsWindowsHelpers.h)0
5 files changed, 8 insertions, 0 deletions
diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk
index cbb0130759e9..cce26a8dcbac 100644
--- a/onlineupdate/StaticLibrary_updatehelper.mk
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@@ -19,8 +19,11 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\
$(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
-DNSS3 \
+ -DUNICODE \
-DVERIFY_MAR_SIGNATURE \
-DXP_WIN=1 \
+ -DNTDDI_VERSION=NTDDI_WIN8 \
+ -DMOZ_MAINTENANCE_SERVICE \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
@@ -28,6 +31,11 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
onlineupdate/source/update/common/readstrings \
onlineupdate/source/update/common/uachelper \
onlineupdate/source/update/common/updatehelper \
+ onlineupdate/source/update/common/updatecommon \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
+ onlineupdate/source/update/common/updateutils_win \
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/service/nsAutoRef.h b/onlineupdate/inc/nsAutoRef.h
index 9a1f3ddd93e9..9a1f3ddd93e9 100644
--- a/onlineupdate/source/service/nsAutoRef.h
+++ b/onlineupdate/inc/nsAutoRef.h
diff --git a/onlineupdate/source/service/nsCharTraits.h b/onlineupdate/inc/nsCharTraits.h
index c81c2f5b2d3b..c81c2f5b2d3b 100644
--- a/onlineupdate/source/service/nsCharTraits.h
+++ b/onlineupdate/inc/nsCharTraits.h
diff --git a/onlineupdate/source/service/nsUTF8Utils.h b/onlineupdate/inc/nsUTF8Utils.h
index 0145011ec152..0145011ec152 100644
--- a/onlineupdate/source/service/nsUTF8Utils.h
+++ b/onlineupdate/inc/nsUTF8Utils.h
diff --git a/onlineupdate/source/service/nsWindowsHelpers.h b/onlineupdate/inc/nsWindowsHelpers.h
index 7c9127580371..7c9127580371 100644
--- a/onlineupdate/source/service/nsWindowsHelpers.h
+++ b/onlineupdate/inc/nsWindowsHelpers.h