X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e1999cff4c8d39584a6723cf0ff2ffec9425c4da..64467fb06c680a7ff9bd863333fb0686a10e50be:/projects/libs/build diff --git a/projects/libs/build b/projects/libs/build index 9ea852a0..8f1f2f4b 100755 --- a/projects/libs/build +++ b/projects/libs/build @@ -65,7 +65,7 @@ fi if [ "$sys" = "Darwin" ] then OS=darwin - MAKE="gmake" + MAKE="make" fi if [ "$OS" = "unknown" ] @@ -77,7 +77,7 @@ then fi printf "#############################################################################\n" -printf " Building STG 2.4 libs for $sys $release\n" +printf " Building STG 2.409 libs for $sys $release\n" printf "#############################################################################\n" STG_LIBS="logger.lib @@ -107,7 +107,6 @@ else if [ "$OS" == "darwin" ] then DEFS="$DEFS -DDARWIN" - LIBICONV="" fi fi fi @@ -123,6 +122,16 @@ then CXX=g++ fi +if [ -z "$AR" ] +then + AR=ar +fi + +if [ -z "$RANLIB" ] +then + RANLIB=ranlib +fi + printf "Checking CC... " $CC --version > /dev/null 2> /dev/null if [ $? != 0 ] @@ -141,6 +150,24 @@ then exit; fi printf "found\n" +printf "Checking AR... " +$AR --version > /dev/null 2> /dev/null +if [ $? != 0 ] +then + printf "FAIL!\n" + printf "$AR not found\n" + exit; +fi +printf "found\n" +printf "Checking RANLIB... " +$RANLIB --version > /dev/null 2> /dev/null +if [ $? != 0 ] +then + printf "FAIL!\n" + printf "$RANLIB not found\n" + exit; +fi +printf "found\n" printf "Checking endianess... " printf "int main() { int probe = 0x00000001; return *(char *)&probe; }\n" > build_check.c @@ -169,7 +196,7 @@ rm -f fake printf "Checking for -lexpat... " printf "#include \nint main() { return 0; }\n" > build_check.c -$CXX $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null +$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_EXPAT=no @@ -182,7 +209,7 @@ rm -f fake printf "Checking for iconv 2nd argument... " printf "#include \nint main(){ const char** src = 0; iconv(0, src, 0, 0, 0); }\n" > build_check.c -$CXX $CXXFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null +$CC $CFLAGS $LDFLAGS -Werror build_check.c $LIBICONV -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then printf "non-const\n" @@ -199,7 +226,7 @@ then printf "no\n" printf "Checking for -lfbclient... " printf "int main() { return 0; }\n" > build_check.c - $CXX $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no @@ -272,6 +299,8 @@ done printf "\n" >> $CONFFILE printf "CC=$CC\n" >> $CONFFILE printf "CXX=$CXX\n" >> $CONFFILE +printf "AR=$AR\n" >> $CONFFILE +printf "RANLIB=$RANLIB\n" >> $CONFFILE printf "CXXFLAGS=$CXXFLAGS\n" >> $CONFFILE printf "CFLAGS=$CFLAGS\n" >> $CONFFILE printf "LDFLAGS=$LDFLAGS\n" >> $CONFFILE