Some changed made on mac

.gitignore

@@ -6,6 +6,7 @@ BetterPushback_XP12_*.zip
 BetterPushback
 lin_x64
 win_x64
+mac_x64
 src/cmake-build-debug
 src/CMakeFiles
 src/CMakeCache.txt

src/bp_cam.c

@@ -772,6 +772,7 @@ draw_icon(button_t *btn, int x, int y, double scale, bool_t is_clicked,
         glVertex2f(x + btn->w * scale, y + btn->h * scale);
         glVertex2f(x + btn->w * scale, y + btn->h * scale);
         glVertex2f(x + btn->w * scale, y);
+        glVertex2f(x + btn->w * scale, y);
         glVertex2f(x, y);
         glEnd();
         XPLMSetGraphicsState(0, 1, 0, 0, 1, 0, 0);

src/libacfutils/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+*.o
 .minimal-deps
 qmake/Makefile
 qmake/libacfutils.a

src/libacfutils/curl/build_curl_deps

@@ -23,23 +23,55 @@ CONFOPTS_COMMON="-DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF \
     -DBUILD_STATIC_LIBS=ON -DHTTP_ONLY=ON -DENABLE_UNIX_SOCKETS=OFF \
     -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_NTLM=ON \
     -DCURL_WINDOWS_SSPI=OFF -DUSE_LIBIDN2=OFF -DUSE_WIN32_IDN=OFF \
-    -DCURL_USE_LIBSSH2=OFF -DUSE_NGHTTP2=OFF -DCURL_ZSTD=OFF"
+    -DCURL_USE_LIBSSH2=OFF -DUSE_NGHTTP2=OFF -DCURL_ZSTD=OFF \
+    -DCURL_USE_LIBPSL=OFF -DCURL_STATIC_CRT=ON -DCURL_USE_OPENSSL=ON"
+CONFOPTS_AUTOCONF="--enable-static --disable-shared --disable-ftp \
+    --disable-file --disable-ldap --disable-ldaps --disable-rtsp \
+    --disable-dict --disable-telnet --disable-tftp --disable-pop3 \
+    --disable-imap --disable-smb --disable-smtp --disable-gopher \
+    --disable-manual --disable-pthreads --disable-unix-sockets \
+    --disable-ipv6 --disable-threaded-resolver --disable-cookies \
+    --disable-ntlm-wb --disable-sspi \
+    --without-winidn --without-libssh2 --without-librtmp \
+    --without-libidn2 --without-nghttp2 --without-zsh-functions-dir \
+    --with-pic --without-zstd  --without-brotli"
 
-export CONFIG_CMAKE=1
+# We must fall back to autoconf in case CMake is too old
+CMAKE_VERSION_STR="$(cmake --version | head -n 1 | awk '{print $3}')"
+CMAKE_VERSION_MAJOR="$(echo "$CMAKE_VERSION_STR" | cut -d . -f 1)"
+CMAKE_VERSION_MINOR="$(echo "$CMAKE_VERSION_STR" | cut -d . -f 2)"
+if [ "$CMAKE_VERSION_MAJOR" -gt 3 ] || \
+    ( [ "$CMAKE_VERSION_MAJOR" -ge 3 ] && [ "$CMAKE_VERSION_MINOR" -ge 7 ] );
+    then
+	export CONFIG_CMAKE=1
+fi
 
 case `uname` in
 	Linux)
-		build_dep "linux-64" "$CONFOPTS_COMMON \
-		    -DOPENSSL_ROOT_DIR=$(pwd)/../ssl/openssl-linux-64 \
-		    -DZLIB_INCLUDE_DIR=$(pwd)/../zlib/zlib-linux-64/include \
-		    -DZLIB_LIBRARY=$(pwd)/../zlib/zlib-linux-64/lib/libz.a" \
-		    "$CURL" "libcurl" "lib/libcurl.a" && \
-		LIBS="-lcrypt32" build_dep "win-64" \
-		    "$CONFOPTS_COMMON \
-		    -DOPENSSL_ROOT_DIR=$(pwd)/../ssl/openssl-win-64 \
-		    -DZLIB_INCLUDE_DIR=$(pwd)/../zlib/zlib-win-64/include \
-		    -DZLIB_LIBRARY=$(pwd)/../zlib/zlib-win-64/lib/libz.a" \
-		    "$CURL" "libcurl" "lib/libcurl.a"
+		if [ -n "$CONFIG_CMAKE" ]; then
+			build_dep "linux-64" "$CONFOPTS_COMMON \
+			    -DOPENSSL_ROOT_DIR=$(pwd)/../ssl/openssl-linux-64 \
+			    -DZLIB_INCLUDE_DIR=$(pwd)/../zlib/zlib-linux-64/include \
+			    -DZLIB_LIBRARY=$(pwd)/../zlib/zlib-linux-64/lib/libz.a" \
+			    "$CURL" "libcurl" "lib/libcurl.a" || exit 1
+			build_dep "win-64" \
+			    "$CONFOPTS_COMMON \
+			    -DOPENSSL_ROOT_DIR=$(pwd)/../ssl/openssl-win-64 \
+			    -DZLIB_INCLUDE_DIR=$(pwd)/../zlib/zlib-win-64/include \
+			    -DZLIB_LIBRARY=$(pwd)/../zlib/zlib-win-64/lib/libz.a" \
+			    "$CURL" "libcurl" "lib/libcurl.a" || exit 1
+		else
+			LIBS="-lpthread" build_dep "linux-64" \
+			    "$CONFOPTS_AUTOCONF \
+			    --with-ssl=$(pwd)/../ssl/openssl-linux-64 \
+			    --with-zlib=$(pwd)/../zlib/zlib-linux-64" \
+			    "$CURL" "libcurl" "lib/libcurl.a" || exit 1
+			LIBS="-lcrypt32" build_dep "win-64" \
+			    "$CONFOPTS_AUTOCONF --host=x86_64-w64-mingw32 \
+			    --with-ssl=$(pwd)/../ssl/openssl-win-64 \
+			    --with-zlib=$(pwd)/../zlib/zlib-win-64" \
+			    "$CURL" "libcurl" "lib/libcurl.a" || exit 1
+		fi
 		;;
 	Darwin)
 		build_dep "mac-64" "$CONFOPTS_COMMON \
@@ -53,4 +85,4 @@ case `uname` in
 		echo "Unsupported build platform" >&2
 		exit 1
 		;;
-esac
+esac