mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

curl: disable use of debug configuration (needs msvcr90d.dll)

Browse Source 
Change-Id: I7c22869028a78f48836741a4eb4cd5bbff16e884
This commit is contained in:
Michael Stahl
2012-10-25 14:26:22 +02:00
parent abc873feb3
commit 6fb13dd1aa
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
curl/makefile.mk
View File

@@ -153,11 +153,14 @@ MACHINE=X86
MACHINE=X64 MACHINE=X64
.ENDIF .ENDIF
.IF "$(debug)"=="" # that debug configuration is disabled for now because it needs msvcr90d.dll
# (the debug MSVC runtime) and that is not copied into the solver currently,
# causing unit tests to fail
#.IF "$(debug)"==""
BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
.ELSE #.ELSE
BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) #BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
.ENDIF #.ENDIF
OUT2BIN=$(BUILD_DIR)$/libcurl.dll OUT2BIN=$(BUILD_DIR)$/libcurl.dll
OUT2LIB=$(BUILD_DIR)$/libcurl.lib OUT2LIB=$(BUILD_DIR)$/libcurl.lib