From 79c4b3ef98c1bc7c67fde238e8081dd8bc59d566 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Thu, 22 May 2014 09:55:25 +0200 Subject: [PATCH] Fixed SDL 1.2 support --- neo/framework/Licensee.h | 4 ++-- neo/sys/posix/posix_main.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/neo/framework/Licensee.h b/neo/framework/Licensee.h index 3ce42e85..6617f9ac 100644 --- a/neo/framework/Licensee.h +++ b/neo/framework/Licensee.h @@ -64,9 +64,9 @@ If you have questions concerning this license or the applicable additional terms // RB begin // Default base path (used only if none could be found) #ifdef __APPLE__ -#define DEFAULT_BASEPATH "/Applications/rbdoom3-bfg.app/Contents/Resources" +#define DEFAULT_BASEPATH "/Applications/RBDOOM-3-BFG.app/Contents/Resources" #else -#define DEFAULT_BASEPATH "/usr/local/games/rbdoom3-bfg" +#define DEFAULT_BASEPATH "/usr/local/games/rbdoom-3-bfg" #endif // RB end diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp index 502ab04c..a243b0db 100644 --- a/neo/sys/posix/posix_main.cpp +++ b/neo/sys/posix/posix_main.cpp @@ -49,7 +49,10 @@ If you have questions concerning this license or the applicable additional terms #include #endif -#include "SDL2/SDL.h" +#if defined(__APPLE__) +#include +#endif + #include // RB end @@ -93,8 +96,8 @@ static char exit_spawn[ 1024 ]; */ const char* Sys_DefaultSavePath() { -#ifdef __APPLE__ - char* base_path = SDL_GetPrefPath( "", "rbdoom3bfg" ); +#if defined(__APPLE__) + char* base_path = SDL_GetPrefPath( "", "RBDOOM-3-BFG" ); if( base_path ) { savepath = SDL_strdup( base_path );