summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2019-10-22 14:19:39 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-04 17:13:08 +0100
commitd9115e201181b3b3c23f507467dc93f88f0c6517 (patch)
treee482eeb9b9c1d0d44f3c6056111dcad009efbf60
parent5ef941411e7e6f0b59c4baeebce1e83aa2d326e4 (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>
-rw-r--r--odk/settings/settings.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 49e8f18e51a1..25e5cb4af4b4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -124,21 +124,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