From 18a0d3a42a2334bd886ca235abf1c2a1a8fb1a59 Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Tue, 23 May 2023 10:07:51 -0400 Subject: [PATCH 1/2] Fix Linux compile errors. --- AerofoilX/GpFileSystem_X.cpp | 2 +- AerofoilX/GpMain_SDL_X.cpp | 2 +- AerofoilX/GpSystemServices_X.cpp | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/AerofoilX/GpFileSystem_X.cpp b/AerofoilX/GpFileSystem_X.cpp index 592a67e..a07f016 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 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 fbcb8d9..8d229de 100644 --- a/AerofoilX/GpSystemServices_X.cpp +++ b/AerofoilX/GpSystemServices_X.cpp @@ -3,13 +3,8 @@ #include "IGpClipboardContents.h" #include "IGpThreadEvent.h" -#ifdef __MACOS__ #include #include -#else -#include "SDL2/SDL.h" -#endif - #include #include #include From 141b176574df52f2bb3c0e7cca8b51511abfefdc Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Tue, 23 May 2023 15:47:33 -0400 Subject: [PATCH 2/2] AerofoilX: Print missing files to stderr. --- AerofoilX/GpFileSystem_X.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AerofoilX/GpFileSystem_X.cpp b/AerofoilX/GpFileSystem_X.cpp index a07f016..a61e296 100644 --- a/AerofoilX/GpFileSystem_X.cpp +++ b/AerofoilX/GpFileSystem_X.cpp @@ -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; }