diff --git a/ASADTool/ASADTool.vcxproj b/ASADTool/ASADTool.vcxproj index 020a7cf..e34353e 100644 --- a/ASADTool/ASADTool.vcxproj +++ b/ASADTool/ASADTool.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/Aerofoil/Aerofoil.vcxproj b/Aerofoil/Aerofoil.vcxproj index 7251a26..751137f 100644 --- a/Aerofoil/Aerofoil.vcxproj +++ b/Aerofoil/Aerofoil.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/AerofoilAndroid/HowToBuild.txt b/AerofoilAndroid/HowToBuild.txt new file mode 100644 index 0000000..77a8a4b --- /dev/null +++ b/AerofoilAndroid/HowToBuild.txt @@ -0,0 +1,19 @@ +Create a folder in the Aerofoil root directory named "tools" +Put 7-zip's "7z.exe" and "7z.dll" in the "tools" directory + +Build the Aerofoil.sln project in release mode in Visual Studio + +Open a command prompt with administrator privileges +Change the directory to the AerofoilAndroid directory +Run make_symlinks.bat + +First time, and any time data changes: +Run ConvertResources.bat in the root directory +Run copy_packaged_resources.bat in the AerofoilAndroid directory + +First time, and any time source changes: +Run copy_source_package.bat in the AerofoilAndroid directory + +Install Android Studio +Open the AerofoilAndroid directory as a project +Downgrade the JDK to version 11 in the SDK settings \ No newline at end of file diff --git a/AerofoilAndroid/app/build.gradle b/AerofoilAndroid/app/build.gradle index 8aaba98..1753aec 100644 --- a/AerofoilAndroid/app/build.gradle +++ b/AerofoilAndroid/app/build.gradle @@ -8,15 +8,15 @@ else { } android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { if (buildAsApplication) { applicationId "org.thecodedeposit.aerofoil" } minSdkVersion 16 - targetSdkVersion 30 - versionCode 17 - versionName "1.1.3" + targetSdkVersion 33 + versionCode 18 + versionName "1.1.4" externalNativeBuild { ndkBuild { arguments "APP_PLATFORM=android-16" diff --git a/AerofoilAndroid/app/src/main/AndroidManifest.xml b/AerofoilAndroid/app/src/main/AndroidManifest.xml index adaf7c3..ec74e34 100644 --- a/AerofoilAndroid/app/src/main/AndroidManifest.xml +++ b/AerofoilAndroid/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ android:alwaysRetainTaskState="true" android:launchMode="singleInstance" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation" + android:exported="true" > diff --git a/AerofoilAndroid/gradle/wrapper/gradle-wrapper.jar b/AerofoilAndroid/gradle/wrapper/gradle-wrapper.jar index 13372ae..7454180 100644 Binary files a/AerofoilAndroid/gradle/wrapper/gradle-wrapper.jar and b/AerofoilAndroid/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AerofoilAndroid/gradle/wrapper/gradle-wrapper.properties b/AerofoilAndroid/gradle/wrapper/gradle-wrapper.properties index 3bb8c40..ffed3a2 100644 --- a/AerofoilAndroid/gradle/wrapper/gradle-wrapper.properties +++ b/AerofoilAndroid/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Oct 17 02:06:49 EDT 2020 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/AerofoilAndroid/gradlew b/AerofoilAndroid/gradlew index 9d82f78..c53aefa 100644 --- a/AerofoilAndroid/gradlew +++ b/AerofoilAndroid/gradlew @@ -1,74 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -85,76 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/AerofoilAndroid/gradlew.bat b/AerofoilAndroid/gradlew.bat index aec9973..ac1b06f 100644 --- a/AerofoilAndroid/gradlew.bat +++ b/AerofoilAndroid/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/AerofoilSDL/AerofoilSDL.vcxproj b/AerofoilSDL/AerofoilSDL.vcxproj index ac0a600..9082737 100644 --- a/AerofoilSDL/AerofoilSDL.vcxproj +++ b/AerofoilSDL/AerofoilSDL.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/AerofoilX/GpFileSystem_X.cpp b/AerofoilX/GpFileSystem_X.cpp index 592a67e..a61e296 100644 --- a/AerofoilX/GpFileSystem_X.cpp +++ b/AerofoilX/GpFileSystem_X.cpp @@ -27,7 +27,7 @@ #include "UTF8.h" -#if defined(__CYGWIN__) || defined(__MACOS__) +#if defined(__CYGWIN__) || defined(__MACOS__) || defined(__linux) typedef off_t off64_t; #define fstat64 fstat #define fseek64 fseek @@ -305,6 +305,8 @@ GpIOStream *GpFileSystem_X::OpenFileNested(PortabilityLayer::VirtualDirectory_t FILE *f = fopen(resolvedPath.c_str(), mode); if (!f) { + fprintf(stderr, "GpFileSystem_X: Cannot open \"%s\"\n", + resolvedPath.c_str()); free(objStorage); return nullptr; } diff --git a/AerofoilX/GpMain_SDL_X.cpp b/AerofoilX/GpMain_SDL_X.cpp index e5e84f3..310c1ae 100644 --- a/AerofoilX/GpMain_SDL_X.cpp +++ b/AerofoilX/GpMain_SDL_X.cpp @@ -30,7 +30,7 @@ IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProp IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties); IGpInputDriver *GpDriver_CreateInputDriver_SDL2_Gamepad(const GpInputDriverProperties &properties); -#ifdef __MACOS__ +#ifndef _WIN32 int main(int argc, char *argv[]) #else SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]) diff --git a/AerofoilX/GpSystemServices_X.cpp b/AerofoilX/GpSystemServices_X.cpp index 32e0f8f..8d229de 100644 --- a/AerofoilX/GpSystemServices_X.cpp +++ b/AerofoilX/GpSystemServices_X.cpp @@ -3,16 +3,13 @@ #include "IGpClipboardContents.h" #include "IGpThreadEvent.h" -#ifdef __MACOS__ #include #include -#else -#include "SDL2/SDL.h" -#endif - #include #include #include +#include +#include struct GpSystemServices_X_ThreadStartParams { @@ -52,13 +49,19 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context) if (!evt) return nullptr; + pthread_t *threadPtr = static_cast(malloc(sizeof(pthread_t))); + if (!threadPtr) + { + evt->Destroy(); + return nullptr; + } + GpSystemServices_X_ThreadStartParams startParams; startParams.m_threadContext = context; startParams.m_threadFunc = threadFunc; startParams.m_threadStartEvent = evt; - pthread_t thread = nullptr; - if (pthread_create(&thread, nullptr, StaticStartThread, &startParams) != 0) + if (pthread_create(threadPtr, nullptr, StaticStartThread, &startParams) != 0) { evt->Destroy(); return nullptr; @@ -67,7 +70,7 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context) evt->Wait(); evt->Destroy(); - return thread; + return static_cast(threadPtr); } bool GpSystemServices_X::Beep() const diff --git a/CompileShadersD3D11/CompileShadersD3D11.vcxproj b/CompileShadersD3D11/CompileShadersD3D11.vcxproj index 4f21d93..ccd48e7 100644 --- a/CompileShadersD3D11/CompileShadersD3D11.vcxproj +++ b/CompileShadersD3D11/CompileShadersD3D11.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/ConvertColorCursors/ConvertColorCursors.vcxproj b/ConvertColorCursors/ConvertColorCursors.vcxproj index 7e9db34..b7560a9 100644 --- a/ConvertColorCursors/ConvertColorCursors.vcxproj +++ b/ConvertColorCursors/ConvertColorCursors.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/EmitWiXVersion/EmitWiXVersion.vcxproj b/EmitWiXVersion/EmitWiXVersion.vcxproj index 3961cfd..bdec1fb 100644 --- a/EmitWiXVersion/EmitWiXVersion.vcxproj +++ b/EmitWiXVersion/EmitWiXVersion.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/FTagData/FTagData.vcxproj b/FTagData/FTagData.vcxproj index 31d6b9a..b5f2967 100644 --- a/FTagData/FTagData.vcxproj +++ b/FTagData/FTagData.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/FreeType/FreeType.vcxproj b/FreeType/FreeType.vcxproj index 4cfb1f4..89f7ddc 100644 --- a/FreeType/FreeType.vcxproj +++ b/FreeType/FreeType.vcxproj @@ -49,13 +49,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GenerateFonts/GenerateFonts.vcxproj b/GenerateFonts/GenerateFonts.vcxproj index a7583f9..76abf98 100644 --- a/GenerateFonts/GenerateFonts.vcxproj +++ b/GenerateFonts/GenerateFonts.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/GpApp/GpApp.vcxproj b/GpApp/GpApp.vcxproj index 3179bc8..80ed9bd 100644 --- a/GpApp/GpApp.vcxproj +++ b/GpApp/GpApp.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj b/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj index 1866461..9a7d077 100644 --- a/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj +++ b/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GpCommon/GpBuildVersion.h b/GpCommon/GpBuildVersion.h index 1ee1236..d95c5e0 100644 --- a/GpCommon/GpBuildVersion.h +++ b/GpCommon/GpBuildVersion.h @@ -2,8 +2,8 @@ #define GP_BUILD_VERSION_MAJOR 1 #define GP_BUILD_VERSION_MINOR 1 -#define GP_BUILD_VERSION_UPDATE 3 +#define GP_BUILD_VERSION_UPDATE 4 -#define GP_APPLICATION_VERSION_STRING "1.1.3" -#define GP_APPLICATION_COPYRIGHT_STRING "2019-2022 Gale Force Games LLC" +#define GP_APPLICATION_VERSION_STRING "1.1.4" +#define GP_APPLICATION_COPYRIGHT_STRING "2019-2023 Eric Lasota" #define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil" diff --git a/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj b/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj index c8f7f19..905e13f 100644 --- a/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj +++ b/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj index 72ca564..6c1c259 100644 --- a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj +++ b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj b/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj index 57794d4..e07dbb6 100644 --- a/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj +++ b/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/GpShell/GpShell.vcxproj b/GpShell/GpShell.vcxproj index bbb4e45..cb681b4 100644 --- a/GpShell/GpShell.vcxproj +++ b/GpShell/GpShell.vcxproj @@ -20,13 +20,13 @@ StaticLibrary true - v142 + v143 MultiByte StaticLibrary false - v142 + v143 true MultiByte diff --git a/HouseTool/HouseTool.vcxproj b/HouseTool/HouseTool.vcxproj index 9bc3427..1dc3cfc 100644 --- a/HouseTool/HouseTool.vcxproj +++ b/HouseTool/HouseTool.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/MacRomanConversion/MacRomanConversion.vcxproj b/MacRomanConversion/MacRomanConversion.vcxproj index 195bffa..39b8d40 100644 --- a/MacRomanConversion/MacRomanConversion.vcxproj +++ b/MacRomanConversion/MacRomanConversion.vcxproj @@ -20,13 +20,13 @@ StaticLibrary true - v142 + v143 MultiByte StaticLibrary false - v142 + v143 true MultiByte diff --git a/MakeTimestamp/MakeTimestamp.vcxproj b/MakeTimestamp/MakeTimestamp.vcxproj index 3ced700..a8907c1 100644 --- a/MakeTimestamp/MakeTimestamp.vcxproj +++ b/MakeTimestamp/MakeTimestamp.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/MergeGPF/MergeGPF.vcxproj b/MergeGPF/MergeGPF.vcxproj index 72caa02..5ff3a6a 100644 --- a/MergeGPF/MergeGPF.vcxproj +++ b/MergeGPF/MergeGPF.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/MiniRez/MiniRez.vcxproj b/MiniRez/MiniRez.vcxproj index d1af708..6a16935 100644 --- a/MiniRez/MiniRez.vcxproj +++ b/MiniRez/MiniRez.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/PortabilityLayer/PortabilityLayer.vcxproj b/PortabilityLayer/PortabilityLayer.vcxproj index e9d28d8..63e9ae6 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj +++ b/PortabilityLayer/PortabilityLayer.vcxproj @@ -20,13 +20,13 @@ StaticLibrary true - v142 + v143 MultiByte StaticLibrary false - v142 + v143 true MultiByte diff --git a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj index cfdb02d..bea6f83 100644 --- a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj +++ b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj @@ -20,13 +20,13 @@ StaticLibrary true - v142 + v143 MultiByte StaticLibrary false - v142 + v143 true MultiByte diff --git a/bin2gp/bin2gp.vcxproj b/bin2gp/bin2gp.vcxproj index 2f8ddd3..6985a0e 100644 --- a/bin2gp/bin2gp.vcxproj +++ b/bin2gp/bin2gp.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/bin2h/bin2h.vcxproj b/bin2h/bin2h.vcxproj index 04e4c6b..72ef2ea 100644 --- a/bin2h/bin2h.vcxproj +++ b/bin2h/bin2h.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/flattenmov/flattenmov.vcxproj b/flattenmov/flattenmov.vcxproj index b3ba3bb..0cc8f71 100644 --- a/flattenmov/flattenmov.vcxproj +++ b/flattenmov/flattenmov.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/gpr2gpa/gpr2gpa.vcxproj b/gpr2gpa/gpr2gpa.vcxproj index 57309f2..93fcdd8 100644 --- a/gpr2gpa/gpr2gpa.vcxproj +++ b/gpr2gpa/gpr2gpa.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/hqx2bin/hqx2bin.vcxproj b/hqx2bin/hqx2bin.vcxproj index c17eceb..b632da5 100644 --- a/hqx2bin/hqx2bin.vcxproj +++ b/hqx2bin/hqx2bin.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/hqx2gp/hqx2gp.vcxproj b/hqx2gp/hqx2gp.vcxproj index 4ff466c..5e463ae 100644 --- a/hqx2gp/hqx2gp.vcxproj +++ b/hqx2gp/hqx2gp.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/unpacktool/unpacktool.vcxproj b/unpacktool/unpacktool.vcxproj index 11f4306..548ce02 100644 --- a/unpacktool/unpacktool.vcxproj +++ b/unpacktool/unpacktool.vcxproj @@ -20,13 +20,13 @@ Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte diff --git a/zlib/zlib.vcxproj b/zlib/zlib.vcxproj index 34968ae..4160a47 100644 --- a/zlib/zlib.vcxproj +++ b/zlib/zlib.vcxproj @@ -20,13 +20,13 @@ StaticLibrary true - v142 + v143 MultiByte StaticLibrary false - v142 + v143 true MultiByte