[hatari-devel] OSX SDL1 patch

[tin@xxxxxxxxx]

Hi,

while testing Eeros patch on a clean checkout I rediscovered a smal 
patch I had to make to get Hatari to compile with SDL1. See attached.

Regards,
 tIn

>From dfe0616e69439a9f8289c87d2fbeb4cbf15cf692 Mon Sep 17 00:00:00 2001
From: tin <tin>
Date: Mon, 30 Apr 2018 18:51:54 +0200
Subject: [PATCH] =?UTF-8?q?-macOS=20didn=E2=80=99t=20compile=20with=20SDL1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gui-osx/PrefsController.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui-osx/PrefsController.m b/src/gui-osx/PrefsController.m
index 425353a..b8bfa79 100644
--- a/src/gui-osx/PrefsController.m
+++ b/src/gui-osx/PrefsController.m
@@ -788,10 +788,12 @@ BOOL flag1, flag2;
 	IMPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot);
 	IMPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing);
 
+#if WITH_SDL2
 	//1.9.0 SDL2
 	IMPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality);
 	IMPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable) ;				// MS 06-2017
 	IMPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync);
+#endif
 
 	//deal with the Max Zoomed Stepper
 	IMPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth);
@@ -1059,10 +1061,13 @@ BOOL flag1, flag2;
 	EXPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot);
 	EXPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing);
 	//1.9.0 SDL2
+
+#if WITH_SDL2
 	EXPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality);
 	EXPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable) ;					// MS 06-2017
 	EXPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync);
-
+#endif
+	
 	EXPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth);
 	EXPORT_NTEXTFIELD(maxZoomedHeight, ConfigureParams.Screen.nMaxHeight);
 
-- 
2.10.1