Added disclaimer to Makefile, until we can fix the Qt compilation problems.

[virtualjaguar] / src / sdlemu_config.cpp

diff --git a/src/sdlemu_config.cpp b/src/sdlemu_config.cpp
index 9d389218a4528ed9e89ff371dc00d6d82c5ab55e..aa971c1c92c287094c7b492176edc1b905001d0e 100644 (file)
--- a/src/sdlemu_config.cpp
+++ b/src/sdlemu_config.cpp
@@ -16,11 +16,14 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
-#include <stdio.h>
+
+#include "sdlemu_config.h"
+
+#include <stdlib.h>                                                            // For atoi()
+#include <stdio.h>                                                             // For fopen() and friends
+#include <cstring>                                                             // For strcmp()
 #include <string>
 #include <list>
-#include "sdlemu_config.h"
 
 using namespace std;
 
@@ -48,7 +51,7 @@ void string_tokenize_variable()
        for(p = vec.begin(); p != vec.end(); p++) {
                string::size_type lastPos = (*p).LineName().find_first_not_of(delim, 0);
                string::size_type pos     = (*p).LineName().find_first_of(delim, lastPos);
-               
+
                if(string::npos != pos && string::npos != lastPos) {
                        string s = (*p).LineName().substr(lastPos, pos - lastPos);
                        (*p).add_token_variable(s);
@@ -59,12 +62,12 @@ void string_tokenize_variable()
 void string_tokenize_value()
 {
        list<token_list>::iterator p;
-       const string delim = " =\n\t";
-       
+       const string delim = " =\n\t\r";                // "\r" needed for Win32 compatibility...
+
        for(p = vec.begin(); p != vec.end(); p++) {
                string::size_type lastPos = (*p).LineName().find_first_of(delim, 0);
                string::size_type pos     = (*p).LineName().find_first_not_of(delim, lastPos);
-               
+
                if(string::npos != pos && string::npos != lastPos) {
                        string s = (*p).LineName().substr(pos);
                        (*p).add_token_value(s);
@@ -84,11 +87,11 @@ int sdlemu_init_config(const char *filename)
        char *s = new char[len];
        fread(s, 1, len, f);
        string str(s);
-       
-       const string delim = "\n";
+
+       const string delim = "\n\r";            // "\r" needed for Win32 compatibility...
        string::size_type lastPos = str.find_first_not_of(delim, 0);
        string::size_type pos     = str.find_first_of(delim, lastPos);
-       
+
        while (string::npos != pos || string::npos != lastPos) {
                string string = str.substr(lastPos, pos - lastPos);
                if(string[0] == '#')