diff options
| author | Nathan Yee <ny.nathan.yee@gmail.com> | 2015-07-14 14:36:37 -0700 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-07-22 07:18:22 +0200 |
| commit | b59955bf2124b558147033782bf067a3723e4730 (patch) | |
| tree | eb009a5eaa41daaba94cb17c5b6368c4b96dff83 /onlineupdate/Executable_updater.mk | |
| parent | 591238e8a4f1164adb51d3bada0cd90c3e7c655e (diff) | |
online update tdf#68274: fix --enable-online-update=mar on Windows
Change-Id: I397566ae2488799399cad361b24a281d3599cc5b
Diffstat (limited to 'onlineupdate/Executable_updater.mk')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index a4c4f9563108..eb94e8b92610 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -9,6 +9,15 @@ $(eval $(call gb_Executable_Executable,updater)) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_set_include,updater,\ + -I$(SRCDIR)/onlineupdate/source/update/src \ + -I$(SRCDIR)/onlineupdate/source/update/inc \ + -I$(SRCDIR)/onlineupdate/source/update/common \ + -I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \ + $$(INCLUDE) \ +)) +else $(eval $(call gb_Executable_set_include,updater,\ -I$(SRCDIR)/onlineupdate/source/update/src \ -I$(SRCDIR)/onlineupdate/source/update/inc \ @@ -17,22 +26,36 @@ $(eval $(call gb_Executable_set_include,updater,\ -lpthread \ $$(INCLUDE) \ )) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_libs,updater,\ + Ws2_32.lib \ + Gdi32.lib \ + Comctl32.lib \ + Shell32.lib \ + Shlwapi.lib \ +)) +else $(eval $(call gb_Executable_add_libs,updater,\ - -lX11 \ - -lXext \ - -lXrender \ - -lSM \ - -lICE \ + -lX11 \ + -lXext \ + -lXrender \ + -lSM \ + -lICE \ + $(GTK3_LIBS) \ )) +endif +ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_cxxflags,updater,\ - $$(GTK3_CFLAGS) \ + /Zc:wchar_t \ )) - -$(eval $(call gb_Executable_add_libs,updater,\ - $(GTK3_LIBS) \ +else +$(eval $(call gb_Executable_add_cxxflags,updater,\ + $$(GTK3_CFLAGS) \ )) +endif $(eval $(call gb_Executable_use_externals,updater,\ gtk \ |