07359c2428
This reverts commit 45504f9ba8.
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
36 lines
925 B
Makefile
36 lines
925 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_Executable_Executable,scalc))
|
|
|
|
$(eval $(call gb_Executable_set_targettype_gui,scalc,YES))
|
|
|
|
$(eval $(call gb_Executable_add_defs,scalc,\
|
|
-DUNICODE \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_add_ldflags,scalc,\
|
|
/ENTRY:wWinMainCRTStartup \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_libraries,scalc,\
|
|
$(gb_UWINAPI) \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_static_libraries,scalc,\
|
|
winlauncher \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_add_exception_objects,scalc,\
|
|
desktop/win32/source/applauncher/scalc \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_add_nativeres,scalc,scalc/launcher))
|
|
|
|
# vim: set ts=4 sw=4 et:
|