From fd7b0b05b8065d8dd293c02bc8d75f8c8b1cec06 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Wed, 14 Dec 2011 16:01:16 +0100
Subject: [PATCH] Hurr.

---
 Makefile.wii |  4 ++--
 wii/main.c   | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile.wii b/Makefile.wii
index 918847ba66..dbbd383f1a 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -14,12 +14,12 @@ DOL_TARGET := ssnes.dol
 ELF_TARGET := ssnes.elf
 
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
-LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii
+LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
 MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
-LDFLAGS := $(MACHDEP) -L.
+LDFLAGS := $(MACHDEP)
 LIBS := -logc -lsnes -lfat
 
 OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/main.o wii/input.o wii/video.o getopt.o
diff --git a/wii/main.c b/wii/main.c
index 03d88103f4..44db23e852 100644
--- a/wii/main.c
+++ b/wii/main.c
@@ -17,6 +17,7 @@
 
 #undef main
 
+#include <stdlib.h>
 #include <stddef.h>
 #include <sdcard/wiisd_io.h>
 #include <sdcard/gcsd.h>
@@ -24,17 +25,15 @@
 
 int ssnes_main(int argc, char **argv);
 
-static const DISC_INTERFACE *sd = &__io_wiisd;
-
 int main(void)
 {
-   fatMountSimple("sd", sd);
-
    char arg0[] = "ssnes";
    char arg1[] = "sd:/FFIII.smc";
-   char *argv[] = { arg0, arg1, NULL };
-   int ret = ssnes_main(sizeof(argv) / sizeof(argv[0]) - 1, argv);
+   char arg2[] = "-v";
+   char *argv[] = { arg0, arg1, arg2, NULL };
 
+   fatMountSimple("sd", &__io_wiisd);
+   int ret = ssnes_main(sizeof(argv) / sizeof(argv[0]) - 1, argv);
    fatUnmount("sd:");
    return ret;
 }