summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comphelper/Module_comphelper.mk2
-rw-r--r--comphelper/StaticLibrary_windows_process.mk (renamed from onlineupdate/StaticLibrary_winhelper.mk)14
-rw-r--r--comphelper/source/windows/windows_process.cxx (renamed from onlineupdate/source/winhelper/windowsStart.cxx)0
-rw-r--r--include/comphelper/windowsStart.hxx (renamed from onlineupdate/inc/winhelper/windowsStart.hxx)4
-rw-r--r--onlineupdate/Executable_updater.mk2
-rw-r--r--onlineupdate/Module_onlineupdate.mk3
-rw-r--r--onlineupdate/source/update/updater/updater.cxx2
7 files changed, 15 insertions, 12 deletions
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index e04d230d2069..30ac708a927d 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Module_Module,comphelper))
$(eval $(call gb_Module_add_targets,comphelper,\
Library_comphelper \
+ $(if $(filter WNT,$(OS)),\
+ StaticLibrary_windows_process )\
))
$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
diff --git a/onlineupdate/StaticLibrary_winhelper.mk b/comphelper/StaticLibrary_windows_process.mk
index e6058c3f51e7..1b086eac952b 100644
--- a/onlineupdate/StaticLibrary_winhelper.mk
+++ b/comphelper/StaticLibrary_windows_process.mk
@@ -7,16 +7,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,winhelper))
+$(eval $(call gb_StaticLibrary_StaticLibrary,windows_process))
-$(eval $(call gb_StaticLibrary_set_include,winhelper,\
- -I$(SRCDIR)/onlineupdate/inc/ \
- -I$(SRCDIR)/onlineupdate/source/winhelper/ \
+$(eval $(call gb_StaticLibrary_set_include,windows_process,\
$$(INCLUDE) \
))
-$(eval $(call gb_StaticLibrary_add_exception_objects,winhelper,\
- onlineupdate/source/winhelper/windowsStart \
+$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
+ -DUNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
+ comphelper/source/windows/windows_process \
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/winhelper/windowsStart.cxx b/comphelper/source/windows/windows_process.cxx
index 1c782d7a289f..1c782d7a289f 100644
--- a/onlineupdate/source/winhelper/windowsStart.cxx
+++ b/comphelper/source/windows/windows_process.cxx
diff --git a/onlineupdate/inc/winhelper/windowsStart.hxx b/include/comphelper/windowsStart.hxx
index 7a9d54a506f2..ce66ef933b68 100644
--- a/onlineupdate/inc/winhelper/windowsStart.hxx
+++ b/include/comphelper/windowsStart.hxx
@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
-#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+#ifndef INCLUDED_COMPHELPER_WINSTART_HXX
+#define INCLUDED_COMPHELPER_WINSTART_HXX
#ifdef _WIN32
#include <windows.h>
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index 6071ae54837a..754fc9e898d5 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_use_static_libraries,updater,\
libmarverify \
updatehelper \
$(if $(filter WNT,$(OS)), \
- winhelper )\
+ windows_process )\
))
$(eval $(call gb_Executable_use_externals,updater,\
diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk
index 2f3817182e03..a900e631a877 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -17,8 +17,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
StaticLibrary_updatehelper \
$(if $(filter WNT,$(OS)),\
Executable_update_service \
- WinResTarget_updater \
- StaticLibrary_winhelper )\
+ WinResTarget_updater )\
Executable_mar \
Executable_updater \
Executable_mbsdiff \
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx
index 8a1ef8bf5b24..1509d570ba23 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -63,7 +63,7 @@
#include <onlineupdate/mozilla/Types.h>
#ifdef _WIN32
-#include <winhelper/windowsStart.hxx>
+#include <comphelper/windowsStart.hxx>
#include "uachelper.h"
#include "pathhash.h"