Kaydet (Commit) 45504f9b authored tarafından Matúš Kukan's avatar Matúš Kukan

fix windows build

No idea if this is proper fix or it needs to be done otherwise.
üst 010560f5
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,sbase,\ $(eval $(call gb_Executable_add_libs,sbase,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,sbase,\
desktop/win32/source/applauncher/sbase \ desktop/win32/source/applauncher/sbase \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,scalc,\ $(eval $(call gb_Executable_add_libs,scalc,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,scalc,\
desktop/win32/source/applauncher/scalc \ desktop/win32/source/applauncher/scalc \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\ $(eval $(call gb_Executable_add_libs,sdraw,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
desktop/win32/source/applauncher/sdraw \ desktop/win32/source/applauncher/sdraw \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,simpress,\ $(eval $(call gb_Executable_add_libs,simpress,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,simpress,\
desktop/win32/source/applauncher/simpress \ desktop/win32/source/applauncher/simpress \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,smath,\ $(eval $(call gb_Executable_add_libs,smath,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,smath,\
desktop/win32/source/applauncher/smath \ desktop/win32/source/applauncher/smath \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,sweb,\ $(eval $(call gb_Executable_add_libs,sweb,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,sweb,\
desktop/win32/source/applauncher/sweb \ desktop/win32/source/applauncher/sweb \
)) ))
......
...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,swriter,\ ...@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,swriter,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Executable_add_linked_static_libs,swriter,\ $(eval $(call gb_Executable_add_libs,swriter,\
winlauncher \ $(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,\ $(eval $(call gb_Executable_add_noexception_objects,swriter,\
desktop/win32/source/applauncher/swriter \ desktop/win32/source/applauncher/swriter \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment