Commit Graph

816 Commits

Author SHA1 Message Date
Martin Storsjö
f6126a0bb8 Don't add C++ specific compiler flags to CFLAGS, add them to CXXFLAGS 2014-02-20 12:28:00 +02:00
Martin Storsjö
0fc2b6d14e Set the CC and AR tools when building for android as well 2014-02-20 12:28:00 +02:00
Martin Storsjö
64c2164df9 Fix building the gtest library when targeting android
The main purpose is to make sure that the build doesn't fail
if the build directory contains the gtest subdirectory, although
the unittests also could be run on a device.
2014-02-20 12:28:00 +02:00
Martin Storsjö
fc06d8783b Pass the right -mfpu flags for the armeabi-v7a target without NEON 2014-02-20 12:28:00 +02:00
Martin Storsjö
b5a9a83c69 Run ndk-build from the android project top level directory
One doesn't need to run the ndk-build command from within the
jni subdirectory, calling it from the project top level directory
works just as well.

Also remove an unnecessary step of cd ../../../.. at the end -
since all make commands are run in a subshell, we don't need to
restore the current working directory afterwards.
2014-02-20 12:28:00 +02:00
Martin Storsjö
42e80cec0d Don't use LOCAL_PATH in LOCAL_SRC_FILES
These files are automatically relative to the directory of the
current makefile.
2014-02-20 12:28:00 +02:00
Martin Storsjö
6ac6b941cf Don't quote the android building commands in sh -c ''
The full command line can be written as such without any extra
wrapping.
2014-02-20 12:28:00 +02:00
Martin Storsjö
4d31f66873 Chain build commands using && instead of ;
This makes sure the build aborts as soon as possible if there is an
error, instead of having the error message drown in all the
following output.
2014-02-20 12:28:00 +02:00
Martin Storsjö
317eb437b0 Enable x86 assembly by default if building for x86 android
Most users would probably miss enabling it otherwise.

It can still be disabled manually by passing USE_ASM=No on the
make command line.
2014-02-20 11:23:41 +02:00
Licai Guo
34782a84b1 Merge pull request #327 from mstorsjo/ignore-android-files
Ignore project.properties
2014-02-20 16:32:32 +08:00
Martin Storsjö
d9441dc793 Ignore project.properties
This file is autogenerated when building nowadays.
2014-02-20 09:42:52 +02:00
huili2
110bd4184f Merge pull request #326 from licaiguo/fix-allocate-large-memory
fix the crash issues by changing the type of iMbWidth & iMbHeight.
2014-02-20 15:24:44 +08:00
Licai Guo
d69b2faa9f fix the crash issues by changing the type iMbWidth & iMbHeight. 2014-02-19 23:06:35 -08:00
sijchen
e45e859473 Squashed merge from writenal_refactor2 2014-02-20 14:50:04 +08:00
Licai Guo
42cc716395 Merge pull request #324 from volvet/add-missed-namespace-for-encoder
add missed namespace for encoder, remove un-used file
2014-02-20 14:46:05 +08:00
volvet
ab2e5fe207 Merge pull request #321 from licaiguo/add-android-target-option
Add android target option
2014-02-20 14:40:27 +08:00
volvet
e565e50d4d add missed namespace for encoder, remove un-used file 2014-02-20 14:33:03 +08:00
Licai Guo
46b9d5d0da Merge pull request #323 from huili2/check_bit_read
add safety check for bit-reading for headers
2014-02-20 14:17:07 +08:00
Licai Guo
23ea23e7c1 update README 2014-02-19 20:57:24 -08:00
volvet
d6c5c138ee init the spatial last spatial picture if excption 2014-02-20 12:50:37 +08:00
Licai Guo
538d22560f refine android build, add TARGET option to specify target in sdk 2014-02-19 20:49:30 -08:00
Licai Guo
a921bc6589 Merge pull request #320 from huili2/mb_residual_size_check
remain size to prevent MB residual reading overflow
2014-02-20 11:19:57 +08:00
Licai Guo
205e48c766 Merge pull request #319 from ruil2/encoder_update
Simplify encoder interface--remove EncoderFrame2 function
2014-02-20 11:11:04 +08:00
ruil2
3ba6a5f4da Simplify encoder interface--remove EncoderFrame2 from interface
function
2014-02-20 10:33:07 +08:00
volvet
f2d5f05b50 Merge pull request #318 from zhilwang/add-ios-decoder
Add iOS support for decoder.
2014-02-20 10:25:35 +08:00
Ethan Hugg
5306881061 Merge pull request #317 from licaiguo/enable-x86asm-android
enable x86 asm for android
2014-02-19 18:16:49 -08:00
Licai Guo
65c7168d8d Add iOS support for decoder. 2014-02-20 10:08:37 +08:00
Licai Guo
f6e4ed6524 enable x86 asm for android 2014-02-19 17:31:21 -08:00
Ethan Hugg
b20728cc8c Merge pull request #316 from licaiguo/fix-readme
Fix readme
2014-02-19 17:01:02 -08:00
Licai Guo
15fbae9b55 fix typo 2014-02-19 16:54:23 -08:00
Licai Guo
aedb0ebd1d minor fix readme 2014-02-19 16:51:14 -08:00
Ethan Hugg
89cd3cb5b6 Merge pull request #315 from mstorsjo/android-cleanup
Minor cleanup of the android build files
2014-02-19 15:58:12 -08:00
Martin Storsjö
fe17cd5a13 Remove unnecessary commented out code in the android makefiles
Comments isn't a place to store code snippets that might (or
might not) be useful later.
2014-02-19 22:16:09 +02:00
Martin Storsjö
0b74eee631 Ignore files generated while building the android projects 2014-02-19 22:16:09 +02:00
Martin Storsjö
72fb054c10 Remove unused proguard config files 2014-02-19 22:16:09 +02:00
Martin Storsjö
810db4e3fd Add a missing include directory in the android makefiles 2014-02-19 22:16:09 +02:00
Ethan Hugg
6ad8f517dd Merge pull request #314 from mstorsjo/fix-osx-32-bit
Explicitly allow read-only relocations when building on OS X in 32 bit mode
2014-02-19 11:25:13 -08:00
Martin Storsjö
e3fce5095b Explicitly allow read-only relocations when building on OS X in 32 bit mode
This fixes building libwels.dylib, since the assembly code
isn't position independent.
2014-02-19 21:17:57 +02:00
Ethan Hugg
d8e318e0a4 Merge pull request #313 from mstorsjo/fix-msvc-build
Fix msvc build
2014-02-19 11:12:41 -08:00
Martin Storsjö
561027ebac Install the import library as well, in MSVC builds 2014-02-19 21:04:30 +02:00
Martin Storsjö
b1d8671bd4 Support building DLLs with MSVC
MSVC doesn't export any functions at all by default, contrary to
gcc which exports all global functions by default.

Doing the same for linux/OS X isn't too hard, but they use yet
two other, different syntaxes for the corresponding symbol file.
2014-02-19 21:04:30 +02:00
Martin Storsjö
42fb4f562e Make the -shared flag an overrideable variable 2014-02-19 21:04:30 +02:00
Martin Storsjö
44522094bf Use CXX_LINK_O when building the shared library 2014-02-19 21:04:30 +02:00
Martin Storsjö
c6aaf7d117 Install the shared library as well 2014-02-19 21:04:30 +02:00
Martin Storsjö
03c00dc226 Include the x86 common header for x86 MSVC as well 2014-02-19 21:04:30 +02:00
Martin Storsjö
f2be484456 Fix silent builds of the shared library 2014-02-19 21:04:30 +02:00
Ethan Hugg
0a73155bdd Merge pull request #306 from licaiguo/add-android-pull-clean
Add android Support
2014-02-19 09:59:25 -08:00
Ethan Hugg
f7758a3074 Merge pull request #312 from mstorsjo/cleanup-vp-interface
Avoid duplicating the IWelsVP.h header
2014-02-19 09:55:34 -08:00
Ethan Hugg
50e49f3704 Merge pull request #310 from mstorsjo/remove-unused-variables
Avoid declaring unused variables
2014-02-19 09:26:00 -08:00
Martin Storsjö
7acb6cd4d0 Remove the duplicated IWelsVP.h file
Instead have the encoder include it directly from the processing
library.

Both copies of the files were mostly identical so far.
2014-02-19 15:00:49 +02:00