ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/installer.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 488 by iritscen, Wed Dec 30 01:51:38 2009 UTC vs.
Revision 489 by gumby, Sun Jan 24 23:58:16 2010 UTC

# Line 9 | Line 9
9   // TODO: Load credits from text resource file
10   // TODO: Clear mod info fields when mod is de-selected
11  
12 < #define DEBUG
13 <
12 > //#define DEBUG
13 > #ifdef WIN32
14 > //#include <windows.h>
15 > #define popen _popen
16 > #endif
17   #include "boost/date_time/gregorian/gregorian.hpp"
18   #include "boost/date_time/date_parsing.hpp"
19   #include "boost/date_time/posix_time/posix_time.hpp"
# Line 1279 | Line 1282 | bool ProcessAEUpdate(Install_info_cfg *c
1282                  if (exists(strPathToEUFNInstall + strWinGUI))
1283                  {
1284                          if (exists((path)strWinGUI))
1285 <                                rename((path)strWinGUI, (path)strcat(strTrashDir, strWinGUI));
1285 >                                rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1286                          if (exists(strWinGUILang))
1287 <                                rename((path)strWinGUILang, (path)strcat(strTrashDir, strWinGUILang));
1287 >                                rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1288                          rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1289                          rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1290                  }
# Line 1579 | Line 1582 | ModPackage::ModPackage()
1582          readme = "";
1583          globalNeeded = true;
1584   }
1585 <
1585 > #ifndef WIN32
1586   void Sleep(int ms)
1587   {
1588          sleep(ms / 1000);
1589   }
1590 <
1590 > #endif
1591   #ifdef WIN32
1592  
1593   void RedirectIOToConsole()

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)