steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build: let's remove the NO_UI variable 

That option has no effect on the build just confuses people because they
think Factor can be built with/without the UI. The runtime never depends
on any ui libraries.
modern-harvey2
Björn Lindqvist 2017-06-30 00:24:24 +02:00
parent 7a9817aeb6
commit e27bd4020d
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GNUmakefile
View File

@ -149,7 +149,6 @@ help:
@echo "" @echo ""
@echo "DEBUG=1 compile VM with debugging information" @echo "DEBUG=1 compile VM with debugging information"
@echo "SITE_CFLAGS=... additional optimization flags" @echo "SITE_CFLAGS=... additional optimization flags"
@echo "NO_UI=1 don't link with X11 libraries (ignored on Mac OS X)"
@echo "X11=1 force link with X11 libraries instead of Cocoa (only on Mac OS X)" @echo "X11=1 force link with X11 libraries instead of Cocoa (only on Mac OS X)"
ALL = factor factor-ffi-test factor-lib ALL = factor factor-ffi-test factor-lib

33
build.sh
View File

@ -11,7 +11,6 @@ ECHO=echo
OS= OS=
ARCH= ARCH=
WORD= WORD=
NO_UI=${NO_UI-}
GIT_PROTOCOL=${GIT_PROTOCOL:="git"} GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"} GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"}
SCRIPT_ARGS="$*" SCRIPT_ARGS="$*"
@ -218,8 +217,6 @@ check_library_exists() {
$CC $GCC_TEST -o $GCC_OUT -l $1 2>&- $CC $GCC_TEST -o $GCC_OUT -l $1 2>&-
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
$ECHO "not found." $ECHO "not found."
$ECHO "***Factor will compile NO_UI=1"
NO_UI=1
else else
$ECHO "found." $ECHO "found."
fi fi
@ -230,25 +227,21 @@ check_library_exists() {
} }
check_X11_libraries() { check_X11_libraries() {
if [ -z "$NO_UI" ]; then check_library_exists GL
check_library_exists GL check_library_exists X11
check_library_exists X11 check_library_exists pango-1.0
check_library_exists pango-1.0
fi
} }
check_gtk_libraries() { check_gtk_libraries() {
if [ -z "$NO_UI" ]; then check_library_exists gobject-2.0
check_library_exists gobject-2.0 check_library_exists gtk-x11-2.0
check_library_exists gtk-x11-2.0 check_library_exists gdk-x11-2.0
check_library_exists gdk-x11-2.0 check_library_exists gdk_pixbuf-2.0
check_library_exists gdk_pixbuf-2.0 check_library_exists gtkglext-x11-1.0
check_library_exists gtkglext-x11-1.0 check_library_exists atk-1.0
check_library_exists atk-1.0 check_library_exists gio-2.0
check_library_exists gio-2.0 check_library_exists gdkglext-x11-1.0
check_library_exists gdkglext-x11-1.0 check_library_exists pango-1.0
check_library_exists pango-1.0
fi
} }
@ -543,7 +536,7 @@ make_clean() {
} }
make_factor() { make_factor() {
invoke_make CC=$CC CXX=$CXX NO_UI=$NO_UI $MAKE_TARGET -j5 invoke_make CC=$CC CXX=$CXX $MAKE_TARGET -j5
} }
make_clean_factor() { make_clean_factor() {