Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3262 in orxonox.OLD for orxonox/branches/updater/src


Ignore:
Timestamp:
Dec 24, 2004, 10:50:02 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/updater: check for gthread implemented, curl is included into the gui too.

Location:
orxonox/branches/updater/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/updater/src/Makefile.in

    r3243 r3262  
    127127EGREP = @EGREP@
    128128EXEEXT = @EXEEXT@
     129GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     130GTHREAD_LIBS = @GTHREAD_LIBS@
    129131GTK2_CFLAGS = @GTK2_CFLAGS@
    130132GTK2_LIBS = @GTK2_LIBS@
    131133HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    132134HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     135HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     136HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    133137HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    134138HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@

  • orxonox/branches/updater/src/console/Makefile.in

    r3243 r3262  
    104104EGREP = @EGREP@
    105105EXEEXT = @EXEEXT@
     106GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     107GTHREAD_LIBS = @GTHREAD_LIBS@
    106108GTK2_CFLAGS = @GTK2_CFLAGS@
    107109GTK2_LIBS = @GTK2_LIBS@
    108110HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    109111HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     112HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     113HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    110114HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    111115HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@

  • orxonox/branches/updater/src/debug.h

    r3212 r3262  
    11#ifndef _DEBUG_H
    22#define _DEBUG_H
     3
     4#include <stdio.h>
    35
    46#ifdef  DEBUG

  • orxonox/branches/updater/src/gui/Makefile.am

    r3250 r3262  
    1 AM_CXXFLAGS=$(GTK2_CFLAGS) $(MSBITFIELDS)
    2 #AM_LDFLAGS=$(GTK2_LIBS)
    3 LIBS=$(GTK2_LIBS)
     1AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     2#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
     3LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    44
    55bin_PROGRAMS=gui

  • orxonox/branches/updater/src/gui/Makefile.in

    r3259 r3262  
    113113EGREP = @EGREP@
    114114EXEEXT = @EXEEXT@
     115GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     116GTHREAD_LIBS = @GTHREAD_LIBS@
    115117GTK2_CFLAGS = @GTK2_CFLAGS@
    116118GTK2_LIBS = @GTK2_LIBS@
    117119HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    118120HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     121HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     122HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    119123HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    120124HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    125129LDFLAGS = @LDFLAGS@
    126130LIBOBJS = @LIBOBJS@
    127 #AM_LDFLAGS=$(GTK2_LIBS)
    128 LIBS = $(GTK2_LIBS)
     131#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
     132LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    129133LTLIBOBJS = @LTLIBOBJS@
    130134MAKEINFO = @MAKEINFO@
    … …  
    184188target_os = @target_os@
    185189target_vendor = @target_vendor@
    186 AM_CXXFLAGS = $(GTK2_CFLAGS) $(MSBITFIELDS)
     190AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
    187191gui_SOURCES = orxonox_gui.cc \
    188192            orxonox_gui_gtk.cc \

  • orxonox/branches/updater/src/importer/Makefile.in

    r3243 r3262  
    105105EGREP = @EGREP@
    106106EXEEXT = @EXEEXT@
     107GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     108GTHREAD_LIBS = @GTHREAD_LIBS@
    107109GTK2_CFLAGS = @GTK2_CFLAGS@
    108110GTK2_LIBS = @GTK2_LIBS@
    109111HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    110112HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     113HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     114HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    111115HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    112116HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
Note: See TracChangeset for help on using the changeset viewer.