Don't build against the debugging MSVC runtime in a dbgutil build either
We don't use the debugging runtime in LO's own code in dbgutil builds, so we shouldn't use it in bundled libs either. (At one point I did try to use the debugging runtime in a dbgutil build, but had to give up eventually; too many compilation errors thanks to using -D_DEBUG which brings in much more strict checks in the C++ headers. I apparently forgot to fix these makefiles then when I aborted the attempt.) Change-Id: I I Iedf765b55ba71b811d7fe3074e4c3129783108fd
This commit is contained in:
@@ -99,9 +99,6 @@ BUILD_DIR=$(CONFIGURE_DIR)
|
||||
CONFIGURE_DIR=win32
|
||||
CONFIGURE_ACTION=cscript configure.js
|
||||
CONFIGURE_FLAGS=iconv=no sax1=yes
|
||||
.IF "$(dbgutil)"!=""
|
||||
CONFIGURE_FLAGS+=debug=yes
|
||||
.ENDIF
|
||||
BUILD_ACTION=nmake
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
@@ -97,9 +97,6 @@ BUILD_DIR=$(CONFIGURE_DIR)
|
||||
CONFIGURE_DIR=win32
|
||||
CONFIGURE_ACTION=cscript configure.js
|
||||
#CONFIGURE_FLAGS=iconv=no sax1=yes
|
||||
.IF "$(dbgutil)"!=""
|
||||
CONFIGURE_FLAGS+=debug=yes
|
||||
.ENDIF
|
||||
BUILD_ACTION=nmake
|
||||
BUILD_DIR=$(CONFIGURE_DIR)
|
||||
.ENDIF
|
||||
|
Reference in New Issue
Block a user