desktop/Executable_sbase.mk | 7 +++++-- desktop/Executable_scalc.mk | 7 +++++-- desktop/Executable_sdraw.mk | 7 +++++-- desktop/Executable_simpress.mk | 7 +++++-- desktop/Executable_smath.mk | 7 +++++-- desktop/Executable_sweb.mk | 7 +++++-- desktop/Executable_swriter.mk | 7 +++++-- 7 files changed, 35 insertions(+), 14 deletions(-)
New commits: commit 45504f9ba8de2a4372193910b2cb9405f1ea896a Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Mar 16 01:16:34 2012 +0100 fix windows build No idea if this is proper fix or it needs to be done otherwise. diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index f3caf5b..098f8c2 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sbase,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,sbase,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sbase) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 3c9990b..290e880 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,scalc,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,scalc,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,scalc) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index dcea97d..2e57495 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,sdraw,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sdraw) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index ab0cbc0..926ad57 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,simpress,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,simpress,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,simpress) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index fe1607b..ed1b460 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,smath,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,smath,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,smath) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,smath,\ desktop/win32/source/applauncher/smath \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index a8810b1..858bc7a 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,sweb,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,sweb,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,sweb) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,sweb,\ desktop/win32/source/applauncher/sweb \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 74cd0d6..f1e0d65 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,swriter,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,swriter,\ - winlauncher \ +$(eval $(call gb_Executable_add_libs,swriter,\ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ )) +$(call gb_Executable_get_target,swriter) : \ + $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) + $(eval $(call gb_Executable_add_noexception_objects,swriter,\ desktop/win32/source/applauncher/swriter \ ))
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits