diff options
| author | Andrea Weikert <elubie@gmx.net> | 2008-04-24 23:18:46 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2008-04-24 23:18:46 +0400 |
| commit | 003b7cc1fe03cac055a61ec67c9fee638dbb4c1a (patch) | |
| tree | bc4d218ebeb7d27bd0a3e71a9fbc6650af3a3124 /CMakeLists.txt | |
| parent | 28c2d1b2aecf5b8faa7cfe0b0934b5fb1a1b96ff (diff) | |
== 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.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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) |