Commit Graph

205 Commits

Author SHA1 Message Date
Martin Storsjö
ef82e18d74 Silence warnings about insecure CRT functions in the test suite
There is no problem in using the "insecure" CRT functions, as long as
they are used correctly - especially not within the test suite where
they are only are exposed to the test suite input data.

Within the library, these are used via the library internal wrappers
in codec/common/src/crt_util_safe_x.cpp, but we'd rather not use them
in the test suite - just use the normal standard C functions here.
2015-01-16 13:38:06 +02:00
Martin Storsjö
cd55201600 Ignore armasm warnings about instructions that are deprecated in ARMv8
This disables armasm warning A4509, "This form of conditional
instruction is deprecated".

The conditional instructions (such as movcs, addcs, subscs)
have been deprecated in ARMv8, in favor of conditional branches.
This isn't something that we need to take immediate action about,
though, therefore silence the warning.
2015-01-16 13:36:35 +02:00
Sijia Chen
560a33a373 fix to avoid link warning 2015-01-14 18:02:24 +08:00
Sijia Chen
4f826f2e94 add option for generating pdb in windows builds 2015-01-14 16:31:48 +08:00
Martin Storsjö
93621d6d9a Include -lstdc++ under Libs.private in the pkg-config file
This allows linking statically to the library, by passing --static
to pkg-config.
2015-01-02 21:54:21 +02:00
Martin Storsjö
3d263d1087 Set a default SHAREDLIB_DIR in the main Makefile
Only override it in the ones where the default isn't desired.
2014-12-01 15:44:27 +02:00
Martin Storsjö
e132658346 Set SHAREDLIB_DIR for msvc as well 2014-12-01 15:44:27 +02:00
Martin Storsjö
8e419e41d3 Simplify setting the shlib flags for msvc 2014-12-01 15:40:25 +02:00
Martin Storsjö
a7d8142a44 Set the right SHAREDLIBSUFFIXVER for msvc 2014-12-01 15:40:25 +02:00
Martin Storsjö
397e20b0f3 Install the import library via the EXTRA_LIB mechanism on mingw as well
Prior to 3f69873c99, there already was a mechanism for installing
the import library, used for the MSVC builds. Use that for mingw
as well, instead of adding more hardcoded rules.
2014-12-01 15:40:25 +02:00
Nirbheek Chauhan
3f69873c99 Makefile: Fix shared library building on various OSes
Versioned for OS not in (Windows, Android), and create a .dll.a implib on Windows
2014-11-27 02:04:06 +05:30
Martin Storsjö
e415c3fe70 Remove the "platform-" prefix from common shared makefiles
This makes it clearer which ones actually are real platforms
(chosen automatically or explicitly via "make ARCH=foo") and which
ones just are shared helpers.
2014-10-22 10:18:53 +03:00
ruil2
ed341048de refine common moudle for part of intra prediction function 2014-09-25 14:03:11 +08:00
zhuiling
9913b73cb1 improve py and mk 2014-09-12 10:30:56 +08:00
zhuiling
9e7a19291c improve py 2014-09-12 10:29:07 +08:00
zhuiling
0fe477625c improve py, and change mk according to mk 2014-09-12 10:25:46 +08:00
zhuiling
6b64efbf92 improve py 2014-09-12 09:59:46 +08:00
zhuiling
235f6e3474 improve py 2014-09-12 09:56:51 +08:00
zhuiling
77552551f7 py improvement according to Martin's sugesstion 2014-09-12 09:39:14 +08:00
zhuiling
a1dbf6ab13 make clean without OS ARCH except android platform 2014-09-05 16:38:28 +08:00
Martin Storsjö
0f9c2dbb12 Check for $(CXX).exe as well when checking for the android toolchain
This fixes building for android on windows.

Building for android on windows still requires MSYS for running make,
but running the ndk-build of the sample projects from within MSYS
doesn't seem to work (the OS variable from the OpenH264 makefile
interferes with the host system detection in ndk-build), so one still
needs to build it in two steps, first make OS=android ... libopenh264.so,
then building the sample projects manually.
2014-08-13 14:23:09 +03:00
Martin Storsjö
d5a45ec513 Mark the x86 assembly object files as not requiring an executable stack
This avoids having to add extra linker flags in order to specify this.

This is similar to how this already is handled for the arm assembly.
2014-07-25 00:56:39 +03:00
Martin Storsjö
a365b42d3b Consistently use -f elf instead of -f elf32
The freebsd platform file already did things like this.
2014-07-25 00:54:13 +03:00
Martin Storsjö
33a7e02261 Check that a working android toolchain was found
If the user selects a nonexistent ARCH, previously the call that
sets TOOLCHAINPREFIX would set it to contain a long error message,
which makes it quite hard to figure out what actually went wrong.

Instead check that CXX=$(TOLCHAINPREFIX)g++ actually points to a
working executable, and abort immediately if this isn't true.
2014-07-24 01:09:45 +03:00
Martin Storsjö
22f04159bb Fix incorrect indentation in build/platform-android.mk 2014-07-16 21:33:14 +03:00
Martin Storsjö
04f066ae7c Add support for building for the new 64 bit android ABIs
This requires the new NDK r10.

The mips64 ABI is handled by the default case, there's no need to
add custom code for that in platform-android.mk.
2014-07-16 21:32:54 +03:00
Martin Storsjö
27499895f7 Support building outside of the source tree
This allows building two versions for different architectures at
the same time, without the built files clobbering each other.

This is very helpful when trying to track down differences between
two build configurations.

To build outside of the source tree, create the other directory to
use for building (either outside of the openh264 directory, or as
a subdirectory), enter that directory, and do
"make -f path/to/openh264/Makefile".
2014-07-15 20:40:51 +03:00
ruil2
4edc5f60a1 Merge pull request #1126 from mstorsjo/android-simplify
Avoid repeated code for getting the android toolchain prefix
2014-07-10 09:31:57 +08:00
Martin Storsjö
a11fdcd647 Set -Zi instead of -ZI when building with MSVC in debug mode
The -ZI option is only supported when building for 32 bit x86,
when building for x64 or for arm, it gives the warning "/ZI is
not supported on this platform; enabling /Zi instead".

-ZI is for "edit & continue" debugging, which one probably wouldn't
be doing with a build outside of the IDE anyway, so keep it simple
instead of trying to set -ZI specifically for x86 32 bit builds.
2014-07-09 15:13:41 +03:00
Martin Storsjö
6bf65da869 Avoid repeated code for getting the android toolchain prefix 2014-07-09 11:10:33 +03:00
Martin Storsjö
d9f12135d4 Don't pass -L. to the MSVC linker
This avoids warnings - this parameter isn't necessary on MSVC.
2014-07-03 22:05:55 +03:00
zhilwang
ba7dca89d5 Merge pull request #1070 from mstorsjo/remove-unused-function
Remove an unused function in mktargets.py
2014-07-03 13:48:21 +08:00
zhilwang
56edea9bcd Merge pull request #1066 from mstorsjo/android-cpufeatures-dir
Build the android cpu-features.o file in codec/common/src
2014-07-03 13:47:14 +08:00
zhilwang
0ef26d6a3f Merge pull request #1068 from mstorsjo/android-clean
Ignore failures in cleaning android projects
2014-07-03 13:46:59 +08:00
Martin Storsjö
323dc793da Remove an unused function in mktargets.py 2014-07-02 16:56:39 +03:00
Martin Storsjö
dd05a655c2 Regenerate test/common/targets.mk via the mktargets.sh script as well 2014-07-02 15:07:02 +03:00
Martin Storsjö
239050d73c Ignore failures in cleaning android projects
If the android test projects hasn't been built yet, the "make clean"
command will stop at "ant clean" (which fails since build.xml doesn't
exist yet). If this happens, one still would want to run the "make
clean" command to the end, cleaning up any possible intermediate object
files (e.g. from a build for a different platform).
2014-07-02 13:42:52 +03:00
Martin Storsjö
10eeea52fe Build the android cpu-features.o file in codec/common/src
Up until now it was built in codec/common (where all other common
source files were built, until they were split up into
inc/src/x86/arm/arm64).
2014-07-02 13:39:26 +03:00
Martin Storsjö
7ae3fbcfbf Share one implementation of the CReadConfig class between the decoder and encoder console apps 2014-06-30 09:04:12 +03:00
Martin Storsjö
16a4066e7f Generate dependencies while building for android 2014-06-26 15:11:17 +03:00
Martin Storsjö
0f1f158d8b Don't build an unused libmodule.a file
This also avoids another manual edit in module/targets.mk. Now
the file is completely autogenerated by the build/mktargets.sh
script, just as all the other targets.mk files.
2014-06-25 09:12:06 +03:00
Martin Storsjö
5e9492cb6e Use a less generic name for linking to STL when building the plugin for android
This matches the common naming scheme more closely for adding extra
flags to individual parts of the build.

Also deduplicate the static stlport lib name.
2014-06-25 09:12:06 +03:00
Martin Storsjö
b3f7896a51 Inject STL_INCLUDES via MODULE_INCLUDES for the gmp plugin
This avoids having to rely on manual modifications to targets.mk,
which are overwritten if the targets.mk files are regenerated
via the script.
2014-06-25 08:59:55 +03:00
enda mannion
7c0b92e3f6 building plugin on Android 2014-06-24 12:32:09 +01:00
Ethan Hugg
0bc0b71ef3 Rollup of Gecko Media Plugin patches 2014-06-17 19:54:16 -07:00
lingzhu
7818c4f30b Update platform-ios.mk 2014-06-09 09:22:54 +08:00
zhuling13
647182d67c remove comments 2014-06-08 18:12:21 -07:00
zhuling13
cb1c0f9b5a modify 2014-06-06 02:44:22 -07:00
zhuling13
d6ac7f4a60 add iosutdemo 2014-06-05 01:20:50 -07:00
zhuling13
6bf7ad4e2b and space to colon, modify bad note 2014-06-04 18:23:19 -07:00