Merge pull request #17 from WickedSmoke/master

Fix Linux build

AerofoilAndroid/app/build.gradle

@@ -15,8 +15,8 @@ android {
         }
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 16
+        versionCode 17
-        versionName "1.1.2"
+        versionName "1.1.3"
         externalNativeBuild {
             ndkBuild {
                 arguments "APP_PLATFORM=android-16"

AerofoilPortable/GpThreadEvent_Cpp11.cpp

@@ -1,5 +1,7 @@
 #include "GpThreadEvent_Cpp11.h"
 
+#include <stdlib.h>
+
 GpThreadEvent_Cpp11::GpThreadEvent_Cpp11(bool autoReset, bool startSignaled)
 	: m_flag(startSignaled)
 	, m_autoReset(autoReset)

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;
 	}

AerofoilX/GpLogDriver_X.cpp

@@ -4,6 +4,7 @@
 #include "GpApplicationName.h"
 #include "GpIOStream.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <cstring>
 

AerofoilX/GpMain_SDL_X.cpp

@@ -20,7 +20,9 @@
 #include "IGpVOSEventQueue.h"
 
 #include <string>
+#ifdef __MACOS__
 #include "MacInit.h"
+#endif
 
 GpXGlobals g_gpXGlobals;
 
@@ -28,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[])

AerofoilX/GpSystemServices_X.cpp

@@ -3,16 +3,13 @@
 #include "IGpClipboardContents.h"
 #include "IGpThreadEvent.h"
 
-#ifdef __MACOS__
 #include <SDL.h>
 #include <pthread.h>
-#else
-#include "SDL2/SDL.h"
-#endif
-
 #include <time.h>
 #include <unistd.h>
 #include <string>
+#include <string.h>
+#include <stdlib.h>
 
 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<pthread_t*>(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(threadPtr, nullptr, StaticStartThread, &startParams) != 0)
-	if (pthread_create(&thread, 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<void*>(threadPtr);
 }
 
 bool GpSystemServices_X::Beep() const

CMakeLists.txt

@@ -45,6 +45,7 @@ add_library(PortabilityLayer STATIC
 	PortabilityLayer/BitmapImage.cpp
 	PortabilityLayer/ByteSwap.cpp
 	PortabilityLayer/CFileStream.cpp
+	PortabilityLayer/CompositeRenderedFont.cpp
 	PortabilityLayer/DeflateCodec.cpp
 	PortabilityLayer/DialogManager.cpp
 	PortabilityLayer/DisplayDeviceManager.cpp
@@ -240,7 +241,8 @@ target_include_directories(GpApp PRIVATE
 target_link_libraries(GpApp PortabilityLayer)
 
 if(CMAKE_HOST_UNIX)
-	add_executable(${EXECNAME}
+	set(EXEC_SOURCES )
+	list(APPEND EXEC_SOURCES
 		AerofoilPortable/GpSystemServices_POSIX.cpp
 		AerofoilPortable/GpThreadEvent_Cpp11.cpp
 		AerofoilPortable/GpAllocator_C.cpp
@@ -258,7 +260,15 @@ if(CMAKE_HOST_UNIX)
 		AerofoilX/GpFileSystem_X.cpp
 		)
 
-	target_include_directories(${EXECNAME} PRIVATE
+	set(EXEC_LIBS )
+	list(APPEND EXEC_LIBS
+		${SDL2_LIBRARIES}
+		GpApp
+		GpShell
+		)
+
+	set(EXEC_INC_DIRS )
+	list(APPEND EXEC_INC_DIRS
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpShell>
@@ -267,8 +277,22 @@ if(CMAKE_HOST_UNIX)
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
 		${SDL2_INCLUDE_DIRS}
 		)
+	if(PLATFORM STREQUAL "MAC")
+		list(APPEND EXEC_SOURCES
+			AerofoilMac/AerofoilMac/AerofoilApplication.mm
+			AerofoilMac/AerofoilMac/MacInit.mm
+			)
+		list(APPEND EXEC_INC_DIRS
+			$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilMac/AerofoilMac>
+			)
+		list(APPEND EXEC_LIBS
+			"-framework Cocoa"
+			)
+	endif(PLATFORM STREQUAL "MAC")
 
-	target_link_libraries(${EXECNAME} ${SDL2_LIBRARIES} GpApp GpShell)
+	add_executable(${EXECNAME} ${EXEC_SOURCES})
+	target_include_directories(${EXECNAME} PRIVATE ${EXEC_INC_DIRS})
+	target_link_libraries(${EXECNAME} ${EXEC_LIBS})
 endif()
 
 

GpApp/AnimCursor.cpp

@@ -336,7 +336,7 @@ void DisposCursors (void)
 
 void IncrementCursor (void)
 {
-	if (animCursorH == 0)
+	if (animCursorH == nullptr)
 		InitAnimatedCursor(nil);
 	if (animCursorH)
 	{
@@ -356,7 +356,7 @@ void IncrementCursor (void)
 
 void DecrementCursor (void)
 {
-	if (animCursorH == 0)
+	if (animCursorH == nullptr)
 		InitAnimatedCursor(nil);
 	if (animCursorH)
 	{

GpCommon/GpBuildVersion.h

@@ -2,8 +2,8 @@
 
 #define GP_BUILD_VERSION_MAJOR 1
 #define GP_BUILD_VERSION_MINOR 1
-#define GP_BUILD_VERSION_UPDATE 2
+#define GP_BUILD_VERSION_UPDATE 3
 
-#define GP_APPLICATION_VERSION_STRING "1.1.2"
+#define GP_APPLICATION_VERSION_STRING "1.1.3"
-#define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Gale Force Games LLC"
+#define GP_APPLICATION_COPYRIGHT_STRING "2019-2022 Gale Force Games LLC"
 #define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"

PortabilityLayer/PLHandle.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstddef>
+
 namespace PortabilityLayer
 {
 	struct MMHandleBlock;
@@ -24,6 +26,7 @@ class THandle final : public THandleBase
 {
 public:
 	THandle();
+	THandle(std::nullptr_t);
 	THandle(T **hdl);
 	explicit THandle(PortabilityLayer::MMHandleBlock *hdl);
 	THandle(const THandle<T> &other);
@@ -46,6 +49,9 @@ public:
 	bool operator==(T** other) const;
 	bool operator!=(T** other) const;
 
+	bool operator==(std::nullptr_t) const;
+	bool operator!=(std::nullptr_t) const;
+
 	static THandle<T> NullPtr();
 };
 
@@ -74,6 +80,12 @@ inline THandle<T>::THandle()
 {
 }
 
+template<class T>
+inline THandle<T>::THandle(std::nullptr_t)
+	: THandleBase(nullptr)
+{
+}
+
 template<class T>
 inline THandle<T>::THandle(T **hdl)
 	: THandleBase(reinterpret_cast<PortabilityLayer::MMHandleBlock*>(hdl))
@@ -107,17 +119,33 @@ inline bool THandle<T>::operator!=(const THandle<T> &other) const
 template<class T>
 inline bool THandle<T>::operator==(T** other) const
 {
+	if (other == nullptr)
+		return m_hdl == nullptr;
 	return static_cast<void*>(&m_hdl->m_contents) == static_cast<void*>(other);
 }
 
 template<class T>
 inline bool THandle<T>::operator!=(T** other) const
 {
+	if (other == nullptr)
+		return m_hdl != nullptr;
 	return static_cast<void*>(&m_hdl->m_contents) != static_cast<void*>(other);
 }
 
 template<class T>
-THandle<T> THandle<T>::NullPtr()
+inline bool THandle<T>::operator==(std::nullptr_t) const
+{
+	return m_hdl == nullptr;
+}
+
+template<class T>
+inline bool THandle<T>::operator!=(std::nullptr_t) const
+{
+	return m_hdl != nullptr;
+}
+
+template<class T>
+inline THandle<T> THandle<T>::NullPtr()
 {
 	return THandle<T>(static_cast<PortabilityLayer::MMHandleBlock *>(nullptr));
 }

PortabilityLayer/ZipFileProxy.cpp

@@ -10,6 +10,7 @@
 #include "DeflateCodec.h"
 
 #include <algorithm>
+#include <stdlib.h>
 
 namespace
 {
@@ -323,6 +324,11 @@ namespace PortabilityLayer
 				return nullptr;
 			}
 		}
+		else
+		{
+			if (numFiles != 0)
+				return nullptr;
+		}
 
 		bool failed = false;
 

SDL2-2.0.12/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -53,7 +53,12 @@ class HIDDeviceUSB implements HIDDevice {
     public String getSerialNumber() {
         String result = null;
         if (Build.VERSION.SDK_INT >= 21) {
-            result = mDevice.getSerialNumber();
+            try {
+                result = mDevice.getSerialNumber();
+            }
+            catch (SecurityException exception) {
+                //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+            }
         }
         if (result == null) {
             result = "";