cleanup
This commit is contained in:
@@ -317,7 +317,7 @@ int RageFileObj::GetLine( CString &out )
|
|||||||
|
|
||||||
// Always use "\r\n". Even though the program may be running on Unix, the
|
// Always use "\r\n". Even though the program may be running on Unix, the
|
||||||
// files written to a memory card are likely to be edited using Windows.
|
// files written to a memory card are likely to be edited using Windows.
|
||||||
//#if defined(_WIN32)
|
//#if defined(WIN32)
|
||||||
#define NEWLINE "\r\n"
|
#define NEWLINE "\r\n"
|
||||||
//#else
|
//#else
|
||||||
//#define NEWLINE "\n"
|
//#define NEWLINE "\n"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(XBOX)
|
#if defined(WIN32) && !defined(XBOX)
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -173,7 +173,7 @@ static CString GetDirOfExecutable( CString argv0 )
|
|||||||
/* argv[0] can be wrong in most OS's; try to avoid using it. */
|
/* argv[0] can be wrong in most OS's; try to avoid using it. */
|
||||||
|
|
||||||
CString sPath;
|
CString sPath;
|
||||||
#if defined(_WIN32)
|
#if defined(WIN32)
|
||||||
char buf[MAX_PATH];
|
char buf[MAX_PATH];
|
||||||
GetModuleFileName( NULL, buf, sizeof(buf) );
|
GetModuleFileName( NULL, buf, sizeof(buf) );
|
||||||
sPath = buf;
|
sPath = buf;
|
||||||
@@ -186,7 +186,7 @@ static CString GetDirOfExecutable( CString argv0 )
|
|||||||
bool IsAbsolutePath = false;
|
bool IsAbsolutePath = false;
|
||||||
if( sPath.size() == 0 || sPath[0] == '/' )
|
if( sPath.size() == 0 || sPath[0] == '/' )
|
||||||
IsAbsolutePath = true;
|
IsAbsolutePath = true;
|
||||||
#if defined(_WIN32)
|
#if defined(WIN32)
|
||||||
if( sPath.size() > 2 && sPath[1] == ':' && sPath[2] == '/' )
|
if( sPath.size() > 2 && sPath[1] == ':' && sPath[2] == '/' )
|
||||||
IsAbsolutePath = true;
|
IsAbsolutePath = true;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ void RageLog::Flush()
|
|||||||
* way, crash handlers can simply write() the buffer to a file without having
|
* way, crash handlers can simply write() the buffer to a file without having
|
||||||
* to convert line endings, which is tedious when you can't malloc(). */
|
* to convert line endings, which is tedious when you can't malloc(). */
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(WIN32)
|
||||||
#define NEWLINE "\r\n"
|
#define NEWLINE "\r\n"
|
||||||
#else
|
#else
|
||||||
#define NEWLINE "\n"
|
#define NEWLINE "\n"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
namespace avcodec
|
namespace avcodec
|
||||||
{
|
{
|
||||||
#if defined(_WIN32)
|
#if defined(WIN32)
|
||||||
#include "ffmpeg/include/ffmpeg/avformat.h"
|
#include "ffmpeg/include/ffmpeg/avformat.h"
|
||||||
#else
|
#else
|
||||||
#include <ffmpeg/avformat.h>
|
#include <ffmpeg/avformat.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user