Changeset 330


Ignore:
Timestamp:
08/15/13 10:22:01 (6 years ago)
Author:
jls17
Message:
  • CMain::Run stores argv[0] in appConfig, so it could be used later in the resource extractor
Location:
branches/work_304
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/AppConfig.cpp

    r308 r330  
    7272        //Notes to be displayed on home page 
    7373        runNotes = ""; 
     74        argv_0 = ""; 
    7475} 
    7576 
  • branches/work_304/AppConfig.h

    r306 r330  
    8080 
    8181        string runNotes; 
     82        string argv_0; 
    8283 
    8384public: 
  • branches/work_304/Main.cpp

    r308 r330  
    5454                // validate throws exceptions if configuration isnt valid 
    5555                appConfig.Validate(cmdLineValidator); 
     56                 
     57                // store executable for later directory detection 
     58                appConfig.argv_0 = argv[0]; 
    5659 
    5760                if (AppConfig::verboseMode) 
  • branches/work_304/util/ResourceFileLocatorAndExtractor.cpp

    r329 r330  
    1919#include "UntarStream.h" 
    2020#include "../AppException.h" 
     21#include "../ARInside.h" 
    2122#include "../FileSystemUtil.h" 
    2223#include "../gzstream.h" 
     
    4748        if (directory.empty()) 
    4849        { 
    49                 directory = FileSystemUtil::GetRealPathName(FileSystemUtil::GetExecutableDirectory(NULL)); 
     50                directory = FileSystemUtil::GetRealPathName(FileSystemUtil::GetExecutableDirectory(CARInside::GetInstance()->appConfig.argv_0.c_str())); 
    5051        } 
    5152 
Note: See TracChangeset for help on using the changeset viewer.