odk/settings/settings.mk | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 246e521150f00e0ddbb3dbaa58fc70a81f726f03
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Oct 22 14:19:39 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Oct 22 14:19:39 2019 +0200
ODK: cleanup windows linker debug args
This was a somehow confused & partially commented-out setup
Change-Id: Iad5ef6721cda6f85ded3296650ee9a7df9ec59fd
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
