strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ODK: cleanup windows linker debug args

Browse source 
This was a somehow confused & partially commented-out setup

Change-Id: Iad5ef6721cda6f85ded3296650ee9a7df9ec59fd
Reviewed-on: https://gerrit.libreoffice.org/81333
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Thorsten Behrens 2019-10-22 14:19:39 +02:00 committed by Stephan Bergmann
parent c68be56c29
commit 2af494822d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
odk/settings/settings.mk
View file

@ -123,21 +123,20 @@ CC_OUTPUT_SWITCH=-Fo
LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
LIBRARY_LINK_FLAGS=/DLL /DEBUGTYPE:cv
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
LIBRARY_LINK_FLAGS=/DLL
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(OO_SDK_HOME)/settings/component.uno.def
EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b000000 /DEBUGTYPE:cv $(LIBO_SDK_LDFLAGS_STDLIBS)
ifeq "$(DEBUG)" "yes"
LIBRARY_LINK_FLAGS+=/DEBUG
LIBRARY_LINK_FLAGS+=/DEBUGTYPE:cv /DEBUG
EXE_LINK_FLAGS+=/DEBUG
else
EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
endif
LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
URE_MISC=${OFFICE_PROGRAM_PATH}
# use this for release version
#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
#LIBRARY_LINK_FLAGS=/DLL
endif