diff options
| author | fbarchard@google.com <fbarchard@google.com> | 2014-10-06 19:34:22 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com> | 2014-10-06 19:34:22 +0000 |
| commit | 76301c93298c19bfac0b4784706580beace14be5 (patch) | |
| tree | 4a4f4ac36e26de311d2ff008d0db7a613ab99909 | |
| parent | b720049a5483bc2e6fa78ea82369ddd476918b7f (diff) | |
| download | libyuv-76301c93298c19bfac0b4784706580beace14be5.tar.gz | |
cmake fix to make build compatible with Windows builds.
BUG=366
TESTED=untested
R=harryjin@google.com
Review URL: https://webrtc-codereview.appspot.com/23879004
git-svn-id: http://libyuv.googlecode.com/svn/trunk@1112 16f28f9a-4ce2-e073-06de-1de4eb20be90
| -rw-r--r-- | CMakeLists.txt | 48 | ||||
| -rw-r--r-- | README.chromium | 2 | ||||
| -rw-r--r-- | include/libyuv/version.h | 2 |
3 files changed, 27 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4db18f1..6f0fccf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,23 @@ cmake_minimum_required(VERSION 2.8)
-
+
+# Basic CMakeLists for libyuv, compiles w/o the jpeg library
+# created for "roxlu build system" to compile libyuv on windows
+
set(ly_base_dir ${CMAKE_CURRENT_LIST_DIR})
set(ly_src_dir ${ly_base_dir}/source/)
set(ly_inc_dir ${ly_base_dir}/include)
set(ly_lib_name "yuv")
-
+
set(ly_source_files
${ly_src_dir}/compare.cc
${ly_src_dir}/compare_common.cc
${ly_src_dir}/compare_neon.cc
${ly_src_dir}/compare_posix.cc
${ly_src_dir}/compare_win.cc
- ${ly_src_dir}/convert_argb.cc
${ly_src_dir}/convert.cc
- ${ly_src_dir}/convert_from_argb.cc
+ ${ly_src_dir}/convert_argb.cc
${ly_src_dir}/convert_from.cc
- ${ly_src_dir}/convert_jpeg.cc
+ ${ly_src_dir}/convert_from_argb.cc
${ly_src_dir}/convert_to_argb.cc
${ly_src_dir}/convert_to_i420.cc
${ly_src_dir}/cpu_id.cc
@@ -23,8 +25,8 @@ set(ly_source_files ${ly_src_dir}/mjpeg_decoder.cc
${ly_src_dir}/mjpeg_validate.cc
${ly_src_dir}/planar_functions.cc
- ${ly_src_dir}/rotate_argb.cc
${ly_src_dir}/rotate.cc
+ ${ly_src_dir}/rotate_argb.cc
${ly_src_dir}/rotate_mips.cc
${ly_src_dir}/rotate_neon.cc
${ly_src_dir}/row_any.cc
@@ -33,48 +35,48 @@ set(ly_source_files ${ly_src_dir}/row_neon.cc
${ly_src_dir}/row_posix.cc
${ly_src_dir}/row_win.cc
- ${ly_src_dir}/scale_argb.cc
${ly_src_dir}/scale.cc
+ ${ly_src_dir}/scale_argb.cc
${ly_src_dir}/scale_common.cc
${ly_src_dir}/scale_mips.cc
${ly_src_dir}/scale_neon.cc
- ${ly_src_dir}/scale_posix.cc
${ly_src_dir}/scale_win.cc
${ly_src_dir}/video_common.cc
+# ${ly_src_dir}/convert_jpeg.cc
)
-
+
+if (WIN32)
+ list(APPEND ly_source_files
+ ${ly_src_dir}/scale_win.cc
+ )
+endif()
+
set(ly_header_files
${ly_inc_dir}/libyuv/basic_types.h
${ly_inc_dir}/libyuv/compare.h
+ ${ly_inc_dir}/libyuv/convert.h
${ly_inc_dir}/libyuv/convert_argb.h
- ${ly_inc_dir}/libyuv/convert_from_argb.h
${ly_inc_dir}/libyuv/convert_from.h
- ${ly_inc_dir}/libyuv/convert.h
+ ${ly_inc_dir}/libyuv/convert_from_argb.h
${ly_inc_dir}/libyuv/cpu_id.h
${ly_inc_dir}/libyuv/format_conversion.h
- ${ly_inc_dir}/libyuv/mjpeg_decoder.h
${ly_inc_dir}/libyuv/planar_functions.h
- ${ly_inc_dir}/libyuv/rotate_argb.h
${ly_inc_dir}/libyuv/rotate.h
+ ${ly_inc_dir}/libyuv/rotate_argb.h
${ly_inc_dir}/libyuv/row.h
- ${ly_inc_dir}/libyuv/scale_argb.h
${ly_inc_dir}/libyuv/scale.h
+ ${ly_inc_dir}/libyuv/scale_argb.h
${ly_inc_dir}/libyuv/scale_row.h
${ly_inc_dir}/libyuv/version.h
${ly_inc_dir}/libyuv/video_common.h
+ ${ly_inc_dir}/libyuv/mjpeg_decoder.h
)
-
-add_definitions(
- -DLIBYUV_DISABLE_NEON
- -DLIBYUV_DISABLE_MIPS
-)
-
+
include_directories(${ly_inc_dir})
-
+
add_library(${ly_lib_name} STATIC ${ly_source_files})
-
+
install(TARGETS ${ly_lib_name} DESTINATION lib)
-
install(FILES ${ly_header_files} DESTINATION include/libyuv)
install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/)
diff --git a/README.chromium b/README.chromium index 02d8c23..c4d4a4f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1111 +Version: 1112 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 6d723e5..59aed1a 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1111 +#define LIBYUV_VERSION 1112 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT |