ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/main_x.h
(Generate patch)

Comparing Frodo4/Src/main_x.h (file contents):
Revision 1.6 by cebix, 2004-01-14T17:24:19Z vs.
Revision 1.7 by cebix, 2004-01-23T15:07:46Z

# Line 24 | Line 24
24   #include <gnome.h>
25   #endif
26  
27 + #ifdef QTOPIA
28 + extern "C" int main(int argc, char *argv[]);
29 + #include <SDL.h>
30 + #endif
31  
32   extern int init_graphics(void);
33  
# Line 102 | Line 106 | void Frodo::ReadyToRun(void)
106          ThePrefs.Load(prefs_path);
107  
108          // Show preferences editor
109 <        if (ThePrefs.ShowEditor(true, prefs_path)) {
109 > #ifdef HAVE_GLADE
110 >        if (!ThePrefs.ShowEditor(true, prefs_path))
111 >                return;
112 > #endif
113  
114 <                // Create and start C64
115 <                TheC64 = new C64;
116 <                load_rom_files();
117 <                TheC64->Run();
118 <                delete TheC64;
112 <        }
114 >        // Create and start C64
115 >        TheC64 = new C64;
116 >        load_rom_files();
117 >        TheC64->Run();
118 >        delete TheC64;
119   }
120  
121  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines