diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-10-22 14:19:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-23 09:02:55 +0200 |
| commit | 2af494822da31ccadfc96f59d61493cae63d60d7 (patch) | |
| tree | bdbf5ababc9614cb6359a31ef491a05595b546ba /odk/settings | |
| parent | c68be56c295c8dda3043c80d4641575ec2799e55 (diff) | |
ODK: cleanup windows linker debug args
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>
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 25b31cd68fac..7998410704bd 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -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 |