diff --git a/.travis.yml b/.travis.yml index fe0cabfff..13f48ff9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ install: - sudo add-apt-repository ppa:tobydox/mingw -y - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq mingw32-x-gcc mingw32-x-qt; fi +- sudo ln -s /opt/mingw32/bin/moc /opt/mingw32/bin/i686-w64-mingw32-moc - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index 63ee77244..03480ae1f 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -313,11 +313,15 @@ bool JFileSystem::readIntoString(const string & FilePath, string & target) int fileSize = GetFileSize(file); +#ifndef __MINGW32__ try { +#endif target.resize((std::string::size_type) fileSize); +#ifndef __MINGW32__ } catch (bad_alloc&) { return false; } +#endif if (fileSize) diff --git a/projects/mtg/include/config.h b/projects/mtg/include/config.h index ada8c7add..55dcb0e91 100644 --- a/projects/mtg/include/config.h +++ b/projects/mtg/include/config.h @@ -1,7 +1,7 @@ #ifndef _DEBUG_H_ #define _DEBUG_H_ -#if ((defined WIN32) || (defined WP8)) +#if ((defined WIN32) || (defined WP8)) && !defined(__MINGW32__) #define snprintf sprintf_s #endif