fix armel build issues

[drnoksnes] / platform / config.cpp

diff --git a/platform/config.cpp b/platform/config.cpp
index 6893698..82a5b6c 100644 (file)
--- a/platform/config.cpp
+++ b/platform/config.cpp
@@ -190,6 +190,7 @@ static void loadDefaults()
        Config.scaler = 0;
        Config.hacksFile = 0;
        Config.touchscreenInput = false;
+       Config.touchscreenShow = false;
 
        Settings.JoystickEnabled = FALSE;
        Settings.SoundPlaybackRate = 22050;
@@ -361,7 +362,7 @@ static void parseArgs(poptContext optCon)
                                break;
                        case 17:
                                Config.touchscreenInput = true;
-                               // TODO  Touchscreen grid
+                               Config.touchscreenShow = true;
                                break;
                        case 18:
                                Settings.HacksEnabled = TRUE;
@@ -423,14 +424,24 @@ void S9xLoadConfig(int argc, const char ** argv)
        // Command line parameters (including --conf args)
        parseArgs(optCon);
 
+#if CONF_HGW
        if (!gotRomFile() && !hgwLaunched) {
                // User did not specify a ROM file, 
                // and we're not being launched from D-Bus.
                fprintf(stderr, "You need to specify a ROM, like this:\n");
                poptPrintUsage(optCon, stdout, 0);
-               poptFreeContext(optCon); 
+               poptFreeContext(optCon);
                exit(2);
        }
+#else
+       if (!gotRomFile()) {
+               // User did not specify a ROM file
+               fprintf(stderr, "You need to specify a ROM, like this:\n");
+               poptPrintUsage(optCon, stdout, 0);
+               poptFreeContext(optCon);
+               exit(2);
+       }
+#endif
 
        poptFreeContext(optCon);
 }