From 8ad45faec5d2b5a5f1bf27d753c6e2d9d2cc2192 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 22:30:57 -0400 Subject: [PATCH] Just check build env using uname --- .circleci/scripts/build_wxwidgets.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/scripts/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh index 0c6a74c..0013041 100644 --- a/.circleci/scripts/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -17,11 +17,10 @@ tar -xvjf wxWidgets-3.2.1.tar.bz2 > /dev/null cd wxWidgets-3.2.1/ ./autogen.sh -if [[ "$CIRCLE_JOB" == "build_linux" ]]; then -./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" -fi -if [[ "$CIRCLE_JOB" == "build_mac" ]]; then +if [ "$(uname)" == "Linux" ]; then +./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" +elif [ "$(uname)" == "Darwin" ]; then ./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr fi