mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-07-06 19:50:22 +00:00
Merge pull request #21 from juhagman/patch-2
macOS setup: Uses pushd X/Y/Z ; popd instead of cd X/Y/Z ; cd ../../..
This commit is contained in:
commit
39248aa24d
|
@ -16,14 +16,14 @@ rm ./internal/temp/*
|
||||||
|
|
||||||
if [ -z "$(which g++)" ]; then
|
if [ -z "$(which g++)" ]; then
|
||||||
echo "GNU C++ compiler not detected (g++)"
|
echo "GNU C++ compiler not detected (g++)"
|
||||||
echo "Please install Apple Xcode and Apple Command Line Tools for Xcode"
|
echo "Please install Apple's Command Line Tools for Xcode"
|
||||||
echo "before launching QB64 setup."
|
echo "before launching QB64 setup."
|
||||||
Pause
|
Pause
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Building library 'LibQB'"
|
echo "Building library 'LibQB'"
|
||||||
cd internal/c/libqb/os/osx
|
pushd internal/c/libqb/os/osx >/dev/null
|
||||||
rm -f libqb_setup.o
|
rm -f libqb_setup.o
|
||||||
./setup_build.command
|
./setup_build.command
|
||||||
if [ ! -f ./libqb_setup.o ]; then
|
if [ ! -f ./libqb_setup.o ]; then
|
||||||
|
@ -31,10 +31,10 @@ if [ ! -f ./libqb_setup.o ]; then
|
||||||
Pause
|
Pause
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cd ../../../../..
|
popd >/dev/null
|
||||||
|
|
||||||
echo "Building library 'FreeType'"
|
echo "Building library 'FreeType'"
|
||||||
cd internal/c/parts/video/font/ttf/os/osx
|
pushd internal/c/parts/video/font/ttf/os/osx >/dev/null
|
||||||
rm -f src.o
|
rm -f src.o
|
||||||
./setup_build.command
|
./setup_build.command
|
||||||
if [ ! -f ./src.o ]; then
|
if [ ! -f ./src.o ]; then
|
||||||
|
@ -42,13 +42,13 @@ if [ ! -f ./src.o ]; then
|
||||||
Pause
|
Pause
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cd ../../../../../../../..
|
popd >/dev/null
|
||||||
|
|
||||||
echo "Building 'QB64' (~3 min)"
|
echo "Building 'QB64' (~3 min)"
|
||||||
cp ./internal/source/* ./internal/temp/
|
cp ./internal/source/* ./internal/temp/
|
||||||
cd internal/c
|
pushd internal/c >/dev/null
|
||||||
g++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
|
g++ -w qbx.cpp libqb/os/osx/libqb_setup.o parts/video/font/ttf/os/osx/src.o -framework GLUT -framework OpenGL -framework Cocoa -o ../../qb64
|
||||||
cd ../..
|
popd >/dev/null
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
if [ -f ./qb64 ]; then
|
if [ -f ./qb64 ]; then
|
||||||
|
|
Loading…
Reference in a new issue