equal
deleted
inserted
replaced
187 |
187 |
188 set(fpc_flags ${noexecstack_flags} ${pascal_flags} ${hwengine_project}) |
188 set(fpc_flags ${noexecstack_flags} ${pascal_flags} ${hwengine_project}) |
189 |
189 |
190 IF (WIN32) |
190 IF (WIN32) |
191 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) |
191 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) |
192 include_directories(${CMAKE_SOURCE_DIR}/misc/winutils/include) |
192 include_directories(${FFMPEG_INCLUDE_DIR}) |
193 link_directories(${CMAKE_SOURCE_DIR}/misc/winutils/lib) |
|
194 add_library(avwrapper SHARED avwrapper.c) |
193 add_library(avwrapper SHARED avwrapper.c) |
195 target_link_libraries(avwrapper avcodec avformat avutil) |
194 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
196 ELSE() |
195 ELSE() |
197 add_library(avwrapper STATIC avwrapper.c) |
196 add_library(avwrapper STATIC avwrapper.c) |
198 ENDIF() |
197 ENDIF() |
199 |
198 |
200 IF(NOT APPLE) |
199 IF(NOT APPLE) |