Commit Graph

128 Commits

Author SHA1 Message Date
Ethan Hugg
a8159c89d1 Switch to use stable branch of gmp-api 2014-12-04 10:24:36 -08: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ö
9b59e50292 Simplify creating output directories for the install-shared rule 2014-12-01 15:44:27 +02:00
Martin Storsjö
a48b632aed Actually install the shared library into $(SHAREDLIB_DIR) as intended 2014-12-01 15:44:27 +02:00
Martin Storsjö
59c30f8952 Handle generating the versionless library via make rules
This makes sure both "make libopenh264.so" and "make libopenh264.so.0"
work as intended.

Use the versionless name as dependency for the install rule,
to make sure both (if possible) are created.
2014-12-01 15:43:35 +02:00
Martin Storsjö
575b6fb570 Check the suffix instead of checking whether a file is a link
This feels more straightforward - some file systems/environments
(such as MSys) implement symlinks as plain file copies, where
distinguishing whether a file is a link might be hard.
2014-12-01 15:40:25 +02:00
Martin Storsjö
2c9b5b98c0 Actually install the versioned shared library file as well 2014-12-01 15:40:25 +02:00
Martin Storsjö
80beaed5c6 Fix the dependencies of the install-shared target
Previously calling "make install" failed unless the target
actually already was built, for platforms where the shared
libraries are versioned.
2014-12-01 15:40:25 +02:00
Martin Storsjö
8f7e10ab12 Honor the silent build flag when adding the shared library symlink 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
Sijia Chen
a2d5254bc3 update VERSION in Makefile 2014-10-28 17:57:57 +08:00
Ethan Hugg
5cefad2d3f Merge pull request #1460 from zaheerm/pkgconfig
Add .pc file generation to PHONY targets
2014-10-27 10:48:30 -07:00
Zaheer Abbas Merali
fe621b92bf Add .pc file generation to PHONY targets as version change in Makefile needs to cause a rebuild. 2014-10-27 10:00:13 -07:00
Tim-Philipp Müller
1ad797a81e Fix openh264.pc file installation
If there's no pkgconfig subdirectory yet in our
install prefix, create it first, otherwise we'll
end up with a file called 'pkgconfig' instead.
2014-10-27 16:22:58 +00:00
Zaheer Abbas Merali
46d30cd33c Add pkg-config file. 2014-10-26 15:26:52 -07:00
Martin Storsjö
88b7a62f98 Set LDFLAGS after the object files in shared library linking commands
This makes sure that the built libopenh264.so actually links to
libpthread.so.
2014-10-22 09:43:53 +03:00
zhuiling
a1dbf6ab13 make clean without OS ARCH except android platform 2014-09-05 16:38:28 +08:00
zhiliang wang
93af7bfc64 Add UT for Downsample functions. 2014-08-27 15:40:14 +08:00
zhiliang wang
0163eb520d Add UT for VaaCalc Functions. 2014-08-27 13:53:18 +08:00
zhilwang
b1a76aa936 Merge pull request #1215 from mstorsjo/x86-asm-noexec-stack
Mark the x86 assembly object files as not requiring an executable stack
2014-07-25 14:15:17 +08:00
zhilwang
6ba537bee5 Merge pull request #1203 from dongzha/AddAQArm64
add ARM64 Adaptative Quantization code and UT
2014-07-25 13:46:10 +08: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
Jed Davis
cf0ac5504b Don't request executable stacks for Linux GMP plugin.
The codec seems to work without executable stack memory, and in general
executable stacks should be avoided if possible, but the assembler used
for the .asm source files requests it.  This commit adds a linker option
to override that.
2014-07-24 10:55:03 -07:00
Martin Storsjö
4433740722 Fix the name of the version generation makefile target 2014-07-24 17:02:40 +03:00
Martin Storsjö
8253049383 Add dependencies to generating version.h in the object files that use it
Previously the makefile didn't know that there was any dependency between
compiling welsDecoderExt.o and welsEncoderExt.o and the regeneration
of the version.h header. This meant that in parallel builds (make -jX),
make could try to regenerate version.h while compiling welsDecoderExt.o
and welsEncoderExt.o, which would lead to errors about version.h not
existing.

Also add some spacing around the makefile rules.

This fixes parallel make building in certain cases.
2014-07-24 17:02:40 +03:00
HFVideoMac
910c64ef22 add ARM64 Adaptative Quantization code and UT 2014-07-22 15:07:25 +08:00
Martin Storsjö
93e9694bc6 Fix generating the version header when building outside of the source tree
Also silence this command in silent builds.
2014-07-16 10:40:45 +03:00
ruil2
29bb1df645 Merge pull request #1177 from huili2/version_all
version-generate
2014-07-16 10:35:20 +08: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
huili2
333cf6aa97 version-generate 2014-07-14 23:39:31 -07:00
Ethan Hugg
3bc9b47465 Changed gmp-api branch to master and astyled the changes. 2014-07-11 08:42:51 -07:00
Ethan Hugg
17c14d44e2 Pull gmp-api by branch name 2014-07-09 14:51:16 -07: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
Ethan Hugg
58576712fa Merge pull request #1063 from mstorsjo/unify-makefile
Use += for all submodules INCLUDE variables
2014-07-03 12:00:13 -07: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ö
96307dfd2e Use += for all submodules INCLUDE variables
This makes it easier for platform specific makefiles to add
things to some of them. (build/platform-android.mk already does this
for a few submodules, e.g. GTEST_INCLUDES and CODEC_UNITTEST_INCLUDES
already use +=.)
2014-07-02 12:28:35 +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ö
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ö
a24b781e54 Make sure that libgmpopenh264.so is removed on "make clean"
Nothing used the makefile variable $(PLUGINS), and $(LIBRARIES)
is only used for the clean target.
2014-06-25 09:12:01 +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
ruil2
1e43075b25 update expand picture UT 2014-06-12 09:37:30 +08:00
Martin Storsjö
1b3dca6b7d Build libgtest.a and libopenh264.a when doing "make test" for iOS 2014-06-10 16:10:48 +03:00
zhuling13
cb1c0f9b5a modify 2014-06-06 02:44:22 -07:00
zhuling13
310137d045 t 2014-06-05 01:40:28 -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
zhuling13
b4c8f6b778 for cleaning .o and .d files generated by android demo 2014-06-02 20:21:10 -07:00