BUILDING.md: Undocument 32-bit Mac build/packaging
(oversight from previous commit)
This commit is contained in:
28
BUILDING.md
28
BUILDING.md
@@ -328,7 +328,7 @@ Build Recipes
|
|||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|
||||||
### 32-bit Build on 64-bit Linux/Unix/Mac
|
### 32-bit Build on 64-bit Linux/Unix
|
||||||
|
|
||||||
Use export/setenv to set the following environment variables before running
|
Use export/setenv to set the following environment variables before running
|
||||||
CMake:
|
CMake:
|
||||||
@@ -640,28 +640,22 @@ Mac
|
|||||||
make dmg
|
make dmg
|
||||||
|
|
||||||
Create Mac package/disk image. This requires pkgbuild and productbuild, which
|
Create Mac package/disk image. This requires pkgbuild and productbuild, which
|
||||||
are installed by default on OS X 10.7 and later and which can be obtained by
|
are installed by default on OS X 10.7 and later.
|
||||||
installing Xcode 3.2.6 (with the "Unix Development" option) on OS X 10.6.
|
|
||||||
Packages built in this manner can be installed on OS X 10.5 and later, but they
|
|
||||||
must be built on OS X 10.6 or later.
|
|
||||||
|
|
||||||
In order to create a Mac package/disk image that contains universal
|
In order to create a Mac package/disk image that contains universal
|
||||||
x86-64/i386/ARM binaries, set any of the following CMake variables:
|
x86-64/ARM binaries, set the following CMake variable:
|
||||||
|
|
||||||
* `OSX_32BIT_BUILD`: Directory containing an i386 (32-bit) Mac or iOS build of
|
|
||||||
libjpeg-turbo to include in the universal binaries
|
|
||||||
* `IOS_ARMV8_BUILD`: Directory containing an ARMv8 (64-bit) iOS build of
|
* `IOS_ARMV8_BUILD`: Directory containing an ARMv8 (64-bit) iOS build of
|
||||||
libjpeg-turbo to include in the universal binaries
|
libjpeg-turbo to include in the universal binaries
|
||||||
|
|
||||||
You should first use CMake to configure i386 and/or ARMv8 sub-builds of
|
You should first use CMake to configure an ARMv8 sub-build of libjpeg-turbo
|
||||||
libjpeg-turbo (see "Build Recipes" and "Building libjpeg-turbo for iOS" above)
|
(see "Building libjpeg-turbo for iOS" above) in a build directory that matches
|
||||||
in build directories that match those specified in the aforementioned CMake
|
the one specified in the aforementioned CMake variable. Next, configure the
|
||||||
variables. Next, configure the primary build of libjpeg-turbo as an
|
primary (x86-64) build of libjpeg-turbo as an out-of-tree build, specifying the
|
||||||
out-of-tree build, specifying one or more of the aforementioned CMake
|
aforementioned CMake variable, and build it. Once the primary build has been
|
||||||
variables, and build it. Once the primary build has been built, run
|
built, run `make dmg` from the build directory. The packaging system will
|
||||||
`make dmg` from the build directory. The packaging system will build the
|
build the sub-build, use lipo to combine it with the primary build into a
|
||||||
sub-builds, use lipo to combine them into a single set of universal binaries,
|
single set of universal binaries, then package the universal binaries.
|
||||||
then package the universal binaries.
|
|
||||||
|
|
||||||
|
|
||||||
Windows
|
Windows
|
||||||
|
|||||||
Reference in New Issue
Block a user