Commit d319ff2a authored by Gerhard Stein's avatar Gerhard Stein

to_string for mingw 4.8

parent 6e11659c
......@@ -21,6 +21,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT")
IF(WIN32)
SET(APPDIR CGenius)
SET(CPACK_PACKAGE_INSTALL_DIRECTORY ${APPDIR})
SET(CPACK_GENERATOR "ZIP;NSIS")
ELSE(WIN32)
......@@ -31,7 +32,7 @@ ENDIF(WIN32)
IF(WIN32)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
# sure there is at least one set of four (4) backlasshes.
SET(CPACK_NSIS_INSTALLED_ICON_NAME "CGenius.exe")
SET(CPACK_NSIS_DISPLAY_NAME "Commander-Genius")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\clonekeenplus.sourceforge.net")
......
......@@ -387,7 +387,7 @@ bool CEGAGraphicsGalaxy::readEGAHead()
{
// The file can be embedded in an exe file or separate on disk. Look for the disk one first!
std::string filename;
if (m_episode <= 6) filename = JoinPaths(m_path, "EGAHEAD.CK" + std::to_string(m_episode));
if (m_episode <= 6) filename = JoinPaths(m_path, "EGAHEAD.CK" + to_string(m_episode));
else filename = JoinPaths(m_path, "KDREAMSHEAD.EGA"); // Not sure about that one
const int ep = m_episode - 4; // index for EpisodeInfo; 0 - keen4, 1 - keen5, etc.
......@@ -577,7 +577,7 @@ bool CEGAGraphicsGalaxy::begin()
}
// Now read the EGAGRAPH
if (m_episode <= 6) filename = JoinPaths(m_path, "EGAGRAPH.CK" + std::to_string(m_episode));
if (m_episode <= 6) filename = JoinPaths(m_path, "EGAGRAPH.CK" + to_string(m_episode));
else filename = JoinPaths(m_path, "KDREAMS.EGA");
std::ifstream File; OpenGameFileR(File, filename, std::ios::binary);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment