Permalink
Browse files

Fixed linux-x86-64 build. Fixed (cross-compile) win64 build. Updated …

…several aspects of the README.
  • Loading branch information...
1 parent 4d48b0a commit b622994c661c9079282f989fa3051bb460bdfdfb @CleanCut CleanCut committed Dec 11, 2011
Showing with 29 additions and 9 deletions.
  1. +19 −4 README
  2. +1 −1 build.sh
  3. +7 −2 dist.sh
  4. +1 −1 ffmpeg.configure.common
  5. +1 −1 ffmpeg.configure.linux-x86-64
View
23 README
@@ -33,10 +33,22 @@ Run ``build.sh --help`` for more information.
Building on OS X Lion
-_____________________
+---------------------
+- Install Xcode (from Apple's App Store)
- Install yasm (You can install MacPorts and then run 'sudo port install yasm')
+
+Cross-compiling for Win64 ON Linux
+---------------------------
+
+(Instructions are for Ubuntu 11.10 amd64)
+- Install MinGW-64: sudo apt-get install mingw-64
+
+(If you will be creating a release distribution)
+- Install 7-Zip: sudo apt-get install p7zip-full
+
+
Building on Win32
-----------------
@@ -55,7 +67,7 @@ Caveats
AVbin is currently supported only on the following platforms
* Linux
- - x86 (cross-compiled from x86-64)
+ - x86
- x86-64
* Mac OS X 10.6 - 10.7
- x86
@@ -68,7 +80,8 @@ The configuration scripts currently assume cross-compilation for Linux-x86-32.
Minor changes should be needed to to compile on the target platform. Patches
for this or other platforms are welcome.
-Darwin compilation currently requires OS X 10.6 or greater.
+Darwin currently requires OS X 10.6 or greater.
+
Installation and usage
----------------------
@@ -81,6 +94,7 @@ libavutil and libavformat. It also exports some higher-level functions which
have a fixed ABI (they will not change in incompatible ways in future
releases), documented in ``include/avbin.h``.
+
License
-------
@@ -93,7 +107,8 @@ In summary, you must note the usage of FFmpeg and AVbin within the
documentation of your application. If you make changes to either library, you
must include the sources of these changes within your application.
+
Contributions
-------------
-darwin-x86-64 and win64 targets contributed by Micah Richert.
+Original darwin-x86-64 and win64 builds contributed by Micah Richert.
View
@@ -99,7 +99,7 @@ while [ "${1:0:2}" == "--" ]; do
make distclean
find . -name '*.d' -exec rm -f '{}' ';'
find . -name '*.pc' -exec rm -f '{}' ';'
- rm -f config.err config.h config.mak .config .version
+ rm -f config.log config.err config.h config.mak .config .version
popd
rm -rf dist
rm -rf build
View
@@ -61,8 +61,13 @@ dist_win32() {
}
dist_win64() {
- echo "NOT IMPLEMENTED"
- exit -1
+ dist_common
+ cp dist/$PLATFORM/avbin64.dll $DIR/
+ cp README.win64 $DIR/readme.txt
+ pushd dist
+ 7z a -tzip $BASEDIR.zip $BASEDIR
+ popd
+ rm -rf $DIR
}
dist_source() {
View
@@ -13,4 +13,4 @@
# These are usually disabled, but make sure
--disable-network
---disable-zlib
+#--disable-zlib
@@ -8,5 +8,5 @@
#--cpu=i686
--enable-pthreads
---disable-bzlib
+#--disable-bzlib
#--disable-bz2lib

0 comments on commit b622994

Please sign in to comment.