vba-commit

[Spacy <sp...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/sdl
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29806/src/sdl

Modified Files:
	SDL.cpp TestEmu.cpp 
Log Message:
make compilable for Windows x64

Index: TestEmu.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestEmu.cpp	27 May 2006 14:47:33 -0000	1.6
--- TestEmu.cpp	6 Jun 2006 21:04:20 -0000	1.7
***************
*** 35,39 ****
  #include "../getopt.h"
  
! #ifndef WIN32
  # include <unistd.h>
  # define GETCWD getcwd
--- 35,39 ----
  #include "../getopt.h"
  
! #ifndef _WIN32
  # include <unistd.h>
  # define GETCWD getcwd

Index: SDL.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SDL.cpp	6 Jun 2006 14:25:17 -0000	1.13
--- SDL.cpp	6 Jun 2006 21:04:20 -0000	1.14
***************
*** 40,50 ****
  #include "../gb/gbGlobals.h"
  
! #ifndef WIN32
  # include <unistd.h>
  # define GETCWD getcwd
! #else // WIN32
  # include <direct.h>
  # define GETCWD _getcwd
! #endif // WIN32
  
  #ifndef __GNUC__
--- 40,50 ----
  #include "../gb/gbGlobals.h"
  
! #ifndef _WIN32
  # include <unistd.h>
  # define GETCWD getcwd
! #else // _WIN32
  # include <direct.h>
  # define GETCWD _getcwd
! #endif // _WIN32
  
  #ifndef __GNUC__
***************
*** 867,879 ****
    char path[2048];
  
! #ifdef WIN32
  #define PATH_SEP ";"
  #define FILE_SEP '\\'
  #define EXE_NAME "VisualBoyAdvance-SDL.exe"
! #else // ! WIN32
  #define PATH_SEP ":"
  #define FILE_SEP '/'
  #define EXE_NAME "VisualBoyAdvance"
! #endif // ! WIN32
  
    fprintf(stderr, "Searching for file %s\n", name);
--- 867,879 ----
    char path[2048];
  
! #ifdef _WIN32
  #define PATH_SEP ";"
  #define FILE_SEP '\\'
  #define EXE_NAME "VisualBoyAdvance-SDL.exe"
! #else // ! _WIN32
  #define PATH_SEP ":"
  #define FILE_SEP '/'
  #define EXE_NAME "VisualBoyAdvance"
! #endif // ! _WIN32
  
    fprintf(stderr, "Searching for file %s\n", name);
***************
*** 898,902 ****
    }
  
! #ifdef WIN32
    home = getenv("USERPROFILE");
    if(home != NULL) {
--- 898,902 ----
    }
  
! #ifdef _WIN32
    home = getenv("USERPROFILE");
    if(home != NULL) {
***************
*** 907,911 ****
        return f;
    }
! #else // ! WIN32
      fprintf(stderr, "Searching system config directory: %s\n", SYSCONFDIR);
      sprintf(path, "%s%c%s", SYSCONFDIR, FILE_SEP, name);
--- 907,911 ----
        return f;
    }
! #else // ! _WIN32
      fprintf(stderr, "Searching system config directory: %s\n", SYSCONFDIR);
      sprintf(path, "%s%c%s", SYSCONFDIR, FILE_SEP, name);
***************
*** 913,917 ****
      if(f != NULL)
        return f;
! #endif // ! WIN32
  
    if(!strchr(arg0, '/') &&
--- 913,917 ----
      if(f != NULL)
        return f;
! #endif // ! _WIN32
  
    if(!strchr(arg0, '/') &&