Suppress all warnings

This commit is contained in:
Radegast 2013-01-16 18:35:52 +00:00
parent 6ebffaf3fa
commit d883776f5d
3 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@ if(WIN32)
#-----------------------------------------------------------------
if(BUNDLED_JPEG) # static
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/jpeg/libjpeg.lib
COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /f makefile.vc
COMMAND NMAKE /f makefile.vc setup-v10 && NMAKE /C /f makefile.vc
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/jpeg
)
add_custom_target(bundled_jpeg
@ -19,7 +19,7 @@ if(WIN32)
#-----------------------------------------------------------------
if(BUNDLED_CURL) # DLL
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl_imp.lib
COMMAND NMAKE /f Makefile vc-dll
COMMAND NMAKE /C /fMakefile vc-dll VC=vc10
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/libs/curl/lib/release-dll/libcurl.dll ${CMAKE_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl
)

View file

@ -108,7 +108,7 @@ CCDEBUG = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"
CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
CFLAGS = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
CFLAGS = /I. /I../include /nologo /W0 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
CFLAGSLIB = /DCURL_STATICLIB
LNKDLL = link.exe /DLL
LNKLIB = link.exe /lib

View file

@ -12,7 +12,7 @@
!include <win32.mak>
# You may want to adjust these compiler options:
CFLAGS= $(cflags) $(cdebug) $(cvars) -I.
CFLAGS= $(cflags) $(cdebug) $(cvars) /wd4996 -I.
# Generally, we recommend defining any configuration symbols in jconfig.h,
# NOT via -D switches here.