Changeset 489

Timestamp:

Jan 25, 2010, 12:58:16 AM (15 years ago)

Author:

gumby

Message:

Fixes for WIN32

Location:

AE/Installer/trunk/source

Files:

• installer.cpp (modified) (3 diffs)
• main_window.cpp (modified) (1 diff)

AE/Installer/trunk/source/installer.cpp

@@ -10 +10 @@
 // TODO: Clear mod info fields when mod is de-selected
 
-#define DEBUG
-
+//#define DEBUG
+#ifdef WIN32
+//#include <windows.h>
+#define popen _popen
+#endif
 #include "boost/date_time/gregorian/gregorian.hpp"
 #include "boost/date_time/date_parsing.hpp"
@@ -1280 +1283 @@
                 {
                         if (exists((path)strWinGUI))
-                                rename((path)strWinGUI, (path)strcat(strTrashDir, strWinGUI));
+                                rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
                         if (exists(strWinGUILang))
-                                rename((path)strWinGUILang, (path)strcat(strTrashDir, strWinGUILang));
+                                rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
                         rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
                         rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
@@ -1580 +1583 @@
         globalNeeded = true;
 }
-
+#ifndef WIN32
 void Sleep(int ms)
 {
         sleep(ms / 1000);
 }
-
+#endif
 #ifdef WIN32
 

AE/Installer/trunk/source/main_window.cpp

@@ -212 +212 @@
     itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
     menuBar->Append(itemMenu42, _("Options"));
-#ifdef WIN32
-        itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
-        menuBar->Append(itemMenu44, _("Help"));
-#else
+//#ifdef WIN32
+//      itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
+//      menuBar->Append(itemMenu44, _("Help"));
+//#else
         itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
-#endif  
+//#endif        
 
     itemFrame1->SetMenuBar(menuBar);