Skip to content
Snippets Groups Projects
Commit 1961092f authored by Nguyen Anh Quynh's avatar Nguyen Anh Quynh
Browse files

build universal binaries on MacOS by default

parent 23bca5ce
No related branches found
No related tags found
No related merge requests found
...@@ -22,11 +22,6 @@ For Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md) ...@@ -22,11 +22,6 @@ For Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md)
$ cd build $ cd build
$ ../make-share.sh $ ../make-share.sh
On Mac OS, to build universal binaries including both 32-bit & 64-bit code,
replace the last line with:
$ ../make-share.sh macos-universal
In the case you want to compile with all the debug information, replace the In the case you want to compile with all the debug information, replace the
last line with: last line with:
...@@ -46,11 +41,6 @@ For Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md) ...@@ -46,11 +41,6 @@ For Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md)
$ cd build $ cd build
$ ../make-lib.sh $ ../make-lib.sh
On Mac OS, to build universal binaries including both 32-bit & 64-bit code,
replace the last line with:
$ ../make-lib.sh macos-universal
In the case you want to compile with all the debug information, replace the In the case you want to compile with all the debug information, replace the
last line with: last line with:
......
...@@ -8,21 +8,23 @@ usage() ...@@ -8,21 +8,23 @@ usage()
echo "" echo ""
echo "Syntax: make-lib.sh [debug] [macos-universal]" echo "Syntax: make-lib.sh [debug] [macos-universal]"
echo "\tdebug: build with debug info" echo "\tdebug: build with debug info"
echo "\tmacos-universal: build MacOS universal binaries" echo "\tmacos-no-universal: do not build MacOS universal binaries"
echo "" echo ""
} }
BUILDTYPE='Release' BUILDTYPE='Release'
MACOS_UNIVERSAL=''
ARCH='' # on MacOS, build universal binaries by default
ARCH='i386;x86_64'
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
case $1 in case $1 in
debug) debug)
BUILDTYPE='Debug' BUILDTYPE='Debug'
ARCH='' # do not build MacOS universal binaries in debug mode
;; ;;
macos-universal) macos-no-universal)
ARCH='i386;x86_64' ARCH='' # do not build MacOS universal binaries in debug mode
;; ;;
*) *)
echo "ERROR: unknown parameter \"$1\"" echo "ERROR: unknown parameter \"$1\""
......
...@@ -8,21 +8,23 @@ usage() ...@@ -8,21 +8,23 @@ usage()
echo "" echo ""
echo "Syntax: make-share.sh [debug] [macos-universal]" echo "Syntax: make-share.sh [debug] [macos-universal]"
echo "\tdebug: build with debug info" echo "\tdebug: build with debug info"
echo "\tmacos-universal: build MacOS universal binaries" echo "\tmacos-no-universal: do not build MacOS universal binaries"
echo "" echo ""
} }
BUILDTYPE='Release' BUILDTYPE='Release'
MACOS_UNIVERSAL=''
ARCH='' # on MacOS, build universal binaries by default
ARCH='i386;x86_64'
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
case $1 in case $1 in
debug) debug)
BUILDTYPE='Debug' BUILDTYPE='Debug'
ARCH='' # do not build MacOS universal binaries in debug mode
;; ;;
macos-universal) macos-no-universal)
ARCH='i386;x86_64' ARCH='' # do not build MacOS universal binaries in debug mode
;; ;;
*) *)
echo "ERROR: unknown parameter \"$1\"" echo "ERROR: unknown parameter \"$1\""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment