Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4316 in orxonox.OLD for orxonox/branches/physics/src/lib


Ignore:
Timestamp:
May 27, 2005, 12:34:09 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/physics: threaded gui starts parrallel to the particles-demo
also changed some smaller stuff in the gui_gtk-class

Location:
orxonox/branches/physics/src/lib/gui/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/lib/gui/gui/Makefile.am

    r4283 r4316  
    2525noinst_LIBRARIES = libORXgui.a
    2626
    27 libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     27libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
     28                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
    2829
    2930libORXgui_a_SOURCES = gui.cc \

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

    r4283 r4316  
    200200AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    201201noinst_LIBRARIES = libORXgui.a
    202 libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     202libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
     203                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     204
    203205libORXgui_a_SOURCES = gui.cc \
    204206                      gui_gtk.cc \

  • orxonox/branches/physics/src/lib/gui/gui/gui_gtk.cc

    r4178 r4316  
    4747bool initGUI(int argc, char *argv[])
    4848{
    49   executable = new char[strlen(argv[0])+1];
    50   strcpy(executable, argv[0]);
     49  if (argv)
     50    {
     51      executable = new char[strlen(argv[0])+1];
     52      strcpy(executable, argv[0]);
     53    }
     54  else
     55    executable = NULL;
    5156
    5257#ifdef HAVE_GTK2
    … …  
    10801085{
    10811086  static_cast<Option*>(option)->changeOption();
    1082   flags->setTextFromFlags(Window::mainWindow);  //// must be different !!!
     1087#ifdef BUILD_ORXONOX
     1088  flags->setTextFromFlags(Window::mainWindow);
     1089#endif
    10831090}
    10841091#endif /* HAVE_GTK2 */
Note: See TracChangeset for help on using the changeset viewer.