Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4044 in orxonox.OLD for orxonox/branches/guiMerge/src/lib


Ignore:
Timestamp:
May 4, 2005, 7:17:38 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/guiMerge: merged the Gui into the orxonox-binary, but it does not finish nicely (yet)

Location:
orxonox/branches/guiMerge/src/lib
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/guiMerge/src/lib/Makefile.in

    r3789 r4044  
    117117PACKAGE_VERSION = @PACKAGE_VERSION@
    118118PATH_SEPARATOR = @PATH_SEPARATOR@
     119RANLIB = @RANLIB@
    119120SET_MAKE = @SET_MAKE@
    120121SHELL = @SHELL@
    … …  
    125126ac_ct_CC = @ac_ct_CC@
    126127ac_ct_CXX = @ac_ct_CXX@
     128ac_ct_RANLIB = @ac_ct_RANLIB@
    127129ac_ct_STRIP = @ac_ct_STRIP@
    128130am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/graphics/Makefile.in

    r3789 r4044  
    117117PACKAGE_VERSION = @PACKAGE_VERSION@
    118118PATH_SEPARATOR = @PATH_SEPARATOR@
     119RANLIB = @RANLIB@
    119120SET_MAKE = @SET_MAKE@
    120121SHELL = @SHELL@
    … …  
    125126ac_ct_CC = @ac_ct_CC@
    126127ac_ct_CXX = @ac_ct_CXX@
     128ac_ct_RANLIB = @ac_ct_RANLIB@
    127129ac_ct_STRIP = @ac_ct_STRIP@
    128130am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/graphics/importer/Makefile.in

    r3907 r4044  
    147147PACKAGE_VERSION = @PACKAGE_VERSION@
    148148PATH_SEPARATOR = @PATH_SEPARATOR@
     149RANLIB = @RANLIB@
    149150SET_MAKE = @SET_MAKE@
    150151SHELL = @SHELL@
    … …  
    155156ac_ct_CC = @ac_ct_CC@
    156157ac_ct_CXX = @ac_ct_CXX@
     158ac_ct_RANLIB = @ac_ct_RANLIB@
    157159ac_ct_STRIP = @ac_ct_STRIP@
    158160am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/gui/Makefile.in

    r3789 r4044  
    117117PACKAGE_VERSION = @PACKAGE_VERSION@
    118118PATH_SEPARATOR = @PATH_SEPARATOR@
     119RANLIB = @RANLIB@
    119120SET_MAKE = @SET_MAKE@
    120121SHELL = @SHELL@
    … …  
    125126ac_ct_CC = @ac_ct_CC@
    126127ac_ct_CXX = @ac_ct_CXX@
     128ac_ct_RANLIB = @ac_ct_RANLIB@
    127129ac_ct_STRIP = @ac_ct_STRIP@
    128130am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/gui/console/Makefile.in

    r3789 r4044  
    136136PACKAGE_VERSION = @PACKAGE_VERSION@
    137137PATH_SEPARATOR = @PATH_SEPARATOR@
     138RANLIB = @RANLIB@
    138139SET_MAKE = @SET_MAKE@
    139140SHELL = @SHELL@
    … …  
    144145ac_ct_CC = @ac_ct_CC@
    145146ac_ct_CXX = @ac_ct_CXX@
     147ac_ct_RANLIB = @ac_ct_RANLIB@
    146148ac_ct_STRIP = @ac_ct_STRIP@
    147149am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/gui/gui/Makefile.in

    r4039 r4044  
    147147PACKAGE_VERSION = @PACKAGE_VERSION@
    148148PATH_SEPARATOR = @PATH_SEPARATOR@
     149RANLIB = @RANLIB@
    149150SET_MAKE = @SET_MAKE@
    150151SHELL = @SHELL@
    … …  
    155156ac_ct_CC = @ac_ct_CC@
    156157ac_ct_CXX = @ac_ct_CXX@
     158ac_ct_RANLIB = @ac_ct_RANLIB@
    157159ac_ct_STRIP = @ac_ct_STRIP@
    158160am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui.cc

    r4039 r4044  
    4343  OrxonoxGuiKeys* keys = NULL;
    4444  OrxonoxGuiUpdate* update = NULL;
    45 int verbose = 4;
    4645
    4746/* ORXONOXGUI */

  • orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_exec.cc

    r4042 r4044  
    368368
    369369  PRINT(3)("Starting Orxonox\n");
    370   system(progExecutable); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
    371370}
    372371

  • orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_main.cc

    r4040 r4044  
    2626#include "orxonox_gui.h"
    2727
     28int verbose = 4;
     29
    2830int main(int argc, char *argv[])
    2931{

  • orxonox/branches/guiMerge/src/lib/gui/gui/orxonox_gui_update.cc

    r4042 r4044  
    3737OrxonoxGuiUpdate::OrxonoxGuiUpdate(void)
    3838{
     39  this->tmpDir = NULL;
     40  this->homeDir = NULL;
     41  this->installSourceDir = NULL;
     42  this->userName = NULL;
     43
    3944  this->getSystemInfo();
    4045
    … …  
    6267  this->updateFrame->fill(this->updateBox);
    6368  this->setMainWidget(this->updateFrame);
     69
    6470}
    6571
    … …  
    6975OrxonoxGuiUpdate::~OrxonoxGuiUpdate(void)
    7076{
    71   if(this->tmpDir)
    72     delete []this->tmpDir;
    73   if(this->homeDir)
    74     delete []homeDir;
    75   if(this->installDataDir)
    76     delete []this->installDataDir;
    77   if(this->installSourceDir)
    78     delete []this->installSourceDir;
    79   if(this->userName)
    80     delete []this->userName;
    81 
    8277
    8378}
Note: See TracChangeset for help on using the changeset viewer.