equal
deleted
inserted
replaced
195 set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) |
195 set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) |
196 IF (WIN32) |
196 IF (WIN32) |
197 # there are some problems with linking our avwrapper as static lib, so link it as shared |
197 # there are some problems with linking our avwrapper as static lib, so link it as shared |
198 add_library(avwrapper SHARED avwrapper.c) |
198 add_library(avwrapper SHARED avwrapper.c) |
199 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
199 target_link_libraries(avwrapper ${FFMPEG_LIBRARIES}) |
|
200 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) |
200 ELSE() |
201 ELSE() |
201 add_library(avwrapper STATIC avwrapper.c) |
202 add_library(avwrapper STATIC avwrapper.c) |
202 set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags}) |
203 set(pascal_flags "-k${FFMPEG_LIBAVCODEC}" "-k${FFMPEG_LIBAVFORMAT}" "-k${FFMPEG_LIBAVUTIL}" ${pascal_flags}) |
203 # set(pascal_flags "-k${LIBRARY_OUTPUT_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}avwrapper${CMAKE_STATIC_LIBRARY_SUFFIX}" ${pascal_flags}) |
204 # set(pascal_flags "-k${LIBRARY_OUTPUT_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}avwrapper${CMAKE_STATIC_LIBRARY_SUFFIX}" ${pascal_flags}) |
204 ENDIF() |
205 ENDIF() |
254 # add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") |
255 # add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") |
255 # add_dependencies(${engine_output_name} ENGINECLEAN) |
256 # add_dependencies(${engine_output_name} ENGINECLEAN) |
256 # endif() |
257 # endif() |
257 |
258 |
258 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir}) |
259 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir}) |
259 IF (WIN32) |
|
260 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}avwrapper${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION ${target_dir}) |
|
261 ENDIF() |
|