Changeset 489 for AE/Installer


Ignore:
Timestamp:
Jan 25, 2010, 12:58:16 AM (10 years ago)
Author:
gumby
Message:

Fixes for WIN32

Location:
AE/Installer/trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • AE/Installer/trunk/source/installer.cpp

    r487 r489  
    1010// TODO: Clear mod info fields when mod is de-selected
    1111
    12 #define DEBUG
    13 
     12//#define DEBUG
     13#ifdef WIN32
     14//#include <windows.h>
     15#define popen _popen
     16#endif
    1417#include "boost/date_time/gregorian/gregorian.hpp"
    1518#include "boost/date_time/date_parsing.hpp"
     
    12801283                {
    12811284                        if (exists((path)strWinGUI))
    1282                                 rename((path)strWinGUI, (path)strcat(strTrashDir, strWinGUI));
     1285                                rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
    12831286                        if (exists(strWinGUILang))
    1284                                 rename((path)strWinGUILang, (path)strcat(strTrashDir, strWinGUILang));
     1287                                rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
    12851288                        rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
    12861289                        rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
     
    15801583        globalNeeded = true;
    15811584}
    1582 
     1585#ifndef WIN32
    15831586void Sleep(int ms)
    15841587{
    15851588        sleep(ms / 1000);
    15861589}
    1587 
     1590#endif
    15881591#ifdef WIN32
    15891592
  • AE/Installer/trunk/source/main_window.cpp

    r487 r489  
    212212    itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
    213213    menuBar->Append(itemMenu42, _("Options"));
    214 #ifdef WIN32
    215         itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
    216         menuBar->Append(itemMenu44, _("Help"));
    217 #else
     214//#ifdef WIN32
     215//      itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
     216//      menuBar->Append(itemMenu44, _("Help"));
     217//#else
    218218        itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
    219 #endif 
     219//#endif       
    220220
    221221    itemFrame1->SetMenuBar(menuBar);
Note: See TracChangeset for help on using the changeset viewer.