--- AE/Installer/trunk/source/globals.h 2010/03/24 07:12:25 503 +++ AE/Installer/trunk/source/globals.h 2010/03/27 03:48:25 504 @@ -9,7 +9,7 @@ \***************************************************************************/ -#pragma mark INCLUDES +//#pragma mark INCLUDES #include #include #include @@ -18,13 +18,6 @@ #include #include #include -#include "boost/thread.hpp" -#include "boost/tokenizer.hpp" -#include "boost/lexical_cast.hpp" // int -> string -#include "boost/algorithm/string.hpp" -#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations -using namespace boost::filesystem; -using namespace std; #ifdef WIN32 #include #else // assume we're on Mac @@ -38,8 +31,15 @@ using namespace std; #ifndef WX_PRECOMP #include "wx/wx.h" #endif +#include "boost/thread.hpp" +#include "boost/tokenizer.hpp" +#include "boost/lexical_cast.hpp" // int -> string +#include "boost/algorithm/string.hpp" +#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations +using namespace boost::filesystem; +using namespace std; -#pragma mark DEFINES +//#pragma mark DEFINES #define INSTALLER_VERSION "1.2" // only place we need to change this #define UPDATE_LOG_READ_ERR -1 #define UPDATE_INST_REPL_ERR -2 @@ -49,15 +49,15 @@ using namespace std; #define UPDATE_GLOB_AVAIL 2 #define UPDATE_INST_AVAIL 3 #define UPDATE_CONT_UPD 4 - -#pragma mark STRUCTS +#define UPDATE_THIRD_PARTY 5 +//#pragma mark STRUCTS struct ModPackage { bool isInstalled; // replace with function string installerVersion; string name; string modStringName; - int modStringVersion; + float modStringVersion; string platform; bool hasOnis; bool hasDeltas; @@ -91,13 +91,14 @@ struct Install_info_cfg }; -#pragma mark PROTOTYPES +//#pragma mark PROTOTYPES void recompileAll(vector); int globalizeData(void); bool CheckForGlobalization(bool); int GetUpdateStatus(Install_info_cfg *, Install_info_cfg *, bool *); bool ProcessInstallerUpdate(Install_info_cfg *, Install_info_cfg *); bool ProcessAEUpdate(Install_info_cfg *, Install_info_cfg *, bool *); +bool ProcessThirdPartyUpdates(void); void callRefreshMods(void); string escapePath(string input); void setStatusArea(string);