Re: [hatari-devel] OS X compilation

[ Thread Index | Date Index | More lists.tuxfamily.org/hatari-devel Archives ]


Ok, found, see patch below.

BUT there is a big big gap between my own sources now and what's on the repo.... Things need to be in sync. We made a lot of changes, for deprecated function, cosmetic, and bugs.
You can found all my osx-gui directory here:
https://www.dropbox.com/s/8jejx1vrqm4yxfw/gui-osx.zip


In Prefcontroller.m, just for Bob:

@@ -904,51 +941,52 @@
     }

     // Define the HD flag, and export the HD path if one is selected
-    if ([[hdImage stringValue] length] > 0)
+    if ([hrdDisk length] > 0)
     {
- EXPORT_TEXTFIELD(hdImage, ConfigureParams.HardDisk.szHardDiskImage);
-        ConfigureParams.HardDisk.bUseHardDiskImage = true;
+ EXPORT_TEXTFIELD(hrdDisk, ConfigureParams.HardDisk.szIdeMasterHardDiskImage); //
+        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = YES;
     }
     else
     {
-        ConfigureParams.HardDisk.bUseHardDiskImage = false;
+        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = NO;
     }

// Define the IDE HD flag, and export the IDE HD path if one is selected
-    if ([[ideMasterHdImage stringValue] length] > 0)
+    if ([masterIDE length] > 0)
     {
- EXPORT_TEXTFIELD(ideMasterHdImage, ConfigureParams.HardDisk.szIdeMasterHardDiskImage);
-        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = true;
+ EXPORT_TEXTFIELD(masterIDE, ConfigureParams.HardDisk.szIdeMasterHardDiskImage); //
+        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = YES;
     }
     else
     {
-        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = false;
+        ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = NO;
     }

     // IDE Slave
-    if ([[ideSlaveHdImage stringValue] length] > 0)
+    if ([slaveIDE length] > 0)
     {
- EXPORT_TEXTFIELD(ideSlaveHdImage, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage);
-        ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = true;
+ EXPORT_TEXTFIELD(slaveIDE, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage); //
+        ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = YES;
     }
     else
     {
-        ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = false;
+        ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = NO;
     }

// Define the Gemdos flag, and export the Gemdos path if one is selected
-    if ([[gemdosImage stringValue] length] > 0)
+    if ([gemdos length] > 0)
     {
- EXPORT_TEXTFIELD(gemdosImage, ConfigureParams.HardDisk.szHardDiskDirectories[0]);
-        ConfigureParams.HardDisk.bUseHardDiskDirectories = true;
+ EXPORT_TEXTFIELD(gemdos, ConfigureParams.HardDisk.szHardDiskDirectories[0]); //
+        ConfigureParams.HardDisk.bUseHardDiskDirectories = YES;
     }
     else
     {
-        ConfigureParams.HardDisk.bUseHardDiskDirectories = false;
+        ConfigureParams.HardDisk.bUseHardDiskDirectories = NO;
     }

     // Save the per-joystick controls
-    [self saveJoystickControls];
+    [self saveJoystickControls];
+
 }

 // Max Zoomed Adjust





Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/