From 07359c242830bcc934d491870cdf5cb70fc26414 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 12 Dec 2013 17:39:50 +0100 Subject: Revert "fix windows build" This reverts commit 45504f9ba8de2a4372193910b2cb9405f1ea896a. The problem that is apparently fixed here is that link.exe is too dumb to pick the right entry-point if the WinMain definition does not come from an object file but a .lib; in that case it apparently defaults to archaic 8-bit WinMain so tell it to use Unicode one with /ENTRY. Conflicts: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk Change-Id: Ib6239eb0fd3d64fd4a292a0d42d65ef75475c389 --- desktop/Executable_sbase.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'desktop/Executable_sbase.mk') diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 77d0c47b478c..9d35f56554da 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sbase,\ + /ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sbase,\ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sbase,\ + winlauncher \ )) -$(call gb_Executable_get_target,sbase) : \ - $(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) -- cgit