'make iosdmg' now works with 32-bit builds as well

This commit is contained in:
DRC
2012-02-10 01:24:26 +00:00
parent ba12191cc8
commit aad846c416

View File

@@ -644,28 +644,32 @@ make dmg
make udmg [BUILDDIR32={32-bit build directory}] make udmg [BUILDDIR32={32-bit build directory}]
On 64-bit OS X systems, this creates a version of the Macintosh package and On 64-bit OS X systems, this creates a Macintosh package and disk image that
disk image that contains universal i386/x86-64 binaries. You should first contains universal i386/x86-64 binaries. You should first configure a 32-bit
configure a 32-bit out-of-tree build of libjpeg-turbo, then configure a out-of-tree build of libjpeg-turbo, then configure a 64-bit out-of-tree
64-bit out-of-tree build, then run 'make udmg' from the 64-bit build build, then run 'make udmg' from the 64-bit build directory. The build
directory. The build system will look for the 32-bit build under system will look for the 32-bit build under {source_directory}/osxx86 by
{source_directory}/osxx86 by default, but you can override this by setting default, but you can override this by setting the BUILDDIR32 variable on the
the BUILDDIR32 variable on the make command line as shown above. make command line as shown above.
make iosdmg [BUILDDIR32={32-bit build directory}] \ make iosdmg [BUILDDIR32={32-bit build directory}] \
[BUILDDIRARMV6={ARM v6 build directory}] \ [BUILDDIRARMV6={ARM v6 build directory}] \
[BUILDDIRARMV7={ARM v7 build directory}] \ [BUILDDIRARMV7={ARM v7 build directory}] \
On 64-bit OS X systems, this creates a version of the Macintosh package and On OS X systems, this creates a Macintosh package and disk image in which the
disk image that contains universal i386/x86-64/ARM binaries. You should libjpeg-turbo static libraries contain ARM architectures necessary to build
first configure 32-bit, ARM v6, and ARM v7 out-of-tree builds of iOS applications. If building on an x86-64 system, the binaries will also
libjpeg-turbo, then configure a 64-bit out-of-tree build, then run contain the i386 architecture, as with 'make udmg' above. You should first
'make iosdmg' from the 64-bit build directory. The build system will look configure ARM v6 and ARM v7 out-of-tree builds of libjpeg-turbo (see
for the 32-bit build under {source_directory}/osxx86 by default, the ARM v6 "Building libjpeg-turbo for iOS" above.) If you are building an x86-64
build under {source_directory}/iosarmv6 by default, and the ARM v7 build version of libjpeg-turbo, you should configure a 32-bit out-of-tree build as
under {source_directory}/iosarmv7 by default, but you can override this by well. Next, build libjpeg-turbo as you would normally, using an out-of-tree
setting the BUILDDIR32, BUILDDIRARMV6, and/or BUILDDIRARMV7 variables on the build. When it is built, run 'make iosdmg' from the build directory. The
make command line as shown above. build system will look for the ARM v6 build under {source_directory}/iosarmv6
by default, the ARM v7 build under {source_directory}/iosarmv7 by default,
and (if applicable) the 32-bit build under {source_directory}/osxx86 by
default, but you can override this by setting the BUILDDIR32, BUILDDIRARMV6,
and/or BUILDDIRARMV7 variables on the make command line as shown above.
make sunpkg make sunpkg