From a39fa224fe4adcfc7a9189ad93b05a7e89b7a0fd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 29 Nov 2013 16:15:13 +0100
Subject: gcc2 and main directory fixes.


diff --git a/scav.c b/scav.c
index fa22286..38ad157 100644
--- a/scav.c
+++ b/scav.c
@@ -4,6 +4,8 @@
 #define VERSION "SDL Scavenger version 1.4.5.1 (11/05/2010)"
 
 #include "scav.h"
+#include <libgen.h>
+#include <unistd.h>
 
 char demolevel0[]={
 0x04,0x44,0x44,0x07,0x00,0x06,0x60,0x00,0x70,0x44,0x44,0x40,
@@ -1703,6 +1705,8 @@ int main (int argc, char **argv)
    strcpy(rcname,RCNAME);
    strcpy(LevelsName,LEVELSNAME); /* Normally use default name */
 
+   chdir(dirname(argv[0]));
+
 #if defined(__WIN32__) || defined(WIN32)
    /* Crude command line options for windows (no getopt function) */
    if (argc != 1)  /* command line option used */
@@ -1757,7 +1761,6 @@ int main (int argc, char **argv)
    while (1) 
    {
        int option_index = 0;
-       opterr = 0;
        static struct option long_options[] = {
            {"window", 0, 0, 'w'},
            {"help", 0, 0, 'h'},
@@ -1769,6 +1772,7 @@ int main (int argc, char **argv)
 					 {"quiet", 0, 0, 'q'},
            {0, 0, 0, 0}
        };
+       opterr = 0;
 
        c = getopt_long (argc, argv, "hvwsqc:l:L:",
                 long_options, &option_index);
-- 
1.8.3.4

