From 003b7cc1fe03cac055a61ec67c9fee638dbb4c1a Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Thu, 24 Apr 2008 19:18:46 +0000 Subject: == cmake win32 == - fixed CMAKE files for Win32 for new ffmpeg libs - ignore libc in debug build. TODO: debug build with OpenEXR still fails with unresolved externals due to /MTd flag. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fbcc0c933ce..bbc799e7f6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,7 @@ IF(WIN32) SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG_INC ${FFMPEG}/include) - SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49) + SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm) @@ -299,7 +299,7 @@ IF(WIN32) SET(WINTAB_INC ${LIBDIR}/wintab/include) SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib") - SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ") ENDIF(WIN32) IF(APPLE) -- cgit v1.2.3