diff options
Diffstat (limited to 'games/mars/mars.patch')
| -rw-r--r-- | games/mars/mars.patch | 87 |
1 files changed, 13 insertions, 74 deletions
diff --git a/games/mars/mars.patch b/games/mars/mars.patch index 9cbce2d32e..6d0eb147b0 100644 --- a/games/mars/mars.patch +++ b/games/mars/mars.patch @@ -1,22 +1,16 @@ ---- mars-game/src/System/window.original.cpp 2014-04-25 21:17:55.251256504 +0300 -+++ mars-game/src/System/window.cpp 2014-04-25 21:27:53.395778669 +0300 -@@ -33,11 +33,11 @@ - # include <SFML/OpenGL.hpp> - # include <sstream> - # include <time.h> --# include <sys/stat.h> -- --# ifdef __WIN32__ -- # include <windows.h> --# endif -+# include <sys/stat.h> -+ -+# ifdef __WIN32__ -+ # include <windows.h> -+# endif - - - namespace window { +--- mars-game/src/CMakeLists.original.txt 2014-05-08 12:30:55.314629800 +0300 ++++ mars-game/src/CMakeLists.txt 2014-05-08 12:38:59.999570405 +0300 +@@ -68,7 +68,7 @@ + TARGETS + mars + RUNTIME DESTINATION +- ${CMAKE_INSTALL_PREFIX}/games ++ ${CMAKE_INSTALL_PREFIX}/bin + ) + install( + FILES +--- mars-game/src/System/window.original.cpp 2014-05-08 12:18:31.053934339 +0300 ++++ mars-game/src/System/window.cpp 2014-05-08 12:19:45.633001973 +0300 @@ -308,12 +308,12 @@ glEnable(GL_TEXTURE_2D); @@ -30,58 +24,3 @@ - shader->unbind(); + shader->bind(NULL); - window_.popGLStates(); - glPopMatrix(); -@@ -361,7 +361,7 @@ - - std::stringstream filename; - filename << "ScreenShot_" << timeinfo->tm_year << timeinfo->tm_mon << timeinfo->tm_mday << timeinfo->tm_hour << timeinfo->tm_min << timeinfo->tm_sec << "." << settings::C_screenShotFormat; -- -+ - # ifdef __linux__ - mkdir((settings::C_configPath + "screenshots/").c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); - if (shot.saveToFile(settings::C_configPath + "screenshots/" + filename.str())) { -@@ -369,7 +369,7 @@ - hud::displayMessage(*locales::getLocale(locales::SavedScreenshot)); - } else { - std::cout << "Failed saving screenshot to " << settings::C_configPath << "screenshots/" << filename.str() << "." << std::endl; -- } -+ } - # endif - - # ifdef __APPLE__ -@@ -379,17 +379,17 @@ - hud::displayMessage(*locales::getLocale(locales::SavedScreenshot)); - } else { - std::cout << "Failed saving screenshot to " << settings::C_configPath << "screenshots/" << filename.str() << "." << std::endl; -- } -- # endif -- -- # ifdef __WIN32__ -- CreateDirectory((settings::C_configPath + "screenshots/").c_str(), NULL); -+ } -+ # endif -+ -+ # ifdef __WIN32__ -+ CreateDirectory((settings::C_configPath + "screenshots/").c_str(), NULL); - if (shot.SaveToFile(settings::C_configPath + "screenshots/" + filename.str())) { - std::cout << "Saved screenshot to " << settings::C_configPath << "screenshots/" << filename.str() << "." << std::endl; - hud::displayMessage(*locales::getLocale(locales::SavedScreenshot)); - } else { - std::cout << "Failed saving screenshot to " << settings::C_configPath << "screenshots/" << filename.str() << "." << std::endl; -- } -+ } - # endif - } - ---- mars-game/src/CMakeLists.original.txt 2014-04-25 21:38:37.122730974 +0300 -+++ mars-game/src/CMakeLists.txt 2014-04-25 21:41:51.413302008 +0300 -@@ -68,7 +68,7 @@ - TARGETS - mars - RUNTIME DESTINATION -- ${CMAKE_INSTALL_PREFIX}/games -+ ${CMAKE_INSTALL_PREFIX}/bin - ) - install( - FILES |