Changeset 3283 in orxonox.OLD for orxonox/branches
- Timestamp:
- Dec 26, 2004, 12:24:18 AM (20 years ago)
- Location:
- orxonox/branches/updater
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/updater/configure
r3274 r3283 873 873 --without-gtk Prevents GTK from being loaded 874 874 --without-gthread Prevents gThread from being loaded 875 --without-pthread Prevents pthread from being loaded 875 876 --without-curl Prevents libcURL from being loaded 876 877 --without-sdl-image Prevents SDL_image from being loaded … … 3906 3907 fi 3907 3908 3909 ## pthread-disabled 3910 echo "$as_me:$LINENO: checking if pthread should be enabled" >&5 3911 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6 3912 3913 # Check whether --with-pthread or --without-pthread was given. 3914 if test "${with_pthread+set}" = set; then 3915 withval="$with_pthread" 3916 def_pthread=no 3917 else 3918 def_pthread=yes 3919 fi; 3920 if test "$def_pthread" = yes; then 3921 echo "yes" 3922 fi 3923 if test "$def_pthread" = no; then 3924 echo "no" 3925 fi 3926 3908 3927 ## libCurl disabled? 3909 3928 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5 … … 6970 6989 6971 6990 ##checking for pthread 6972 if test x$have_gthread = xyes ; then 6991 if test x$def_pthread = xyes ; then 6992 if test x$have_gthread = xyes ; then 6973 6993 6974 6994 for ac_header in pthread.h … … 7188 7208 LIBS="$LIBS -lpthread" 7189 7209 fi 7190 fi7191 7210 fi 7211 fi 7192 7212 # FIXME: Replace `main' with a function in `-lm': 7193 7213 -
orxonox/branches/updater/configure.ac
r3274 r3283 65 65 fi 66 66 if test "$def_gthread" = no; then 67 echo "no" 68 fi 69 70 ## pthread-disabled 71 AC_MSG_CHECKING([if pthread should be enabled]) 72 AC_ARG_WITH([pthread], 73 AC_HELP_STRING( [--without-pthread], 74 [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes]) 75 if test "$def_pthread" = yes; then 76 echo "yes" 77 fi 78 if test "$def_pthread" = no; then 67 79 echo "no" 68 80 fi … … 404 416 405 417 ##checking for pthread 406 if test x$have_gthread = xyes ; then 418 if test x$def_pthread = xyes ; then 419 if test x$have_gthread = xyes ; then 407 420 AC_CHECK_HEADERS([pthread.h], pthreadHeader="yes", pthreadHeader="no") 408 421 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes) … … 410 423 LIBS="$LIBS -lpthread" 411 424 fi 412 fi413 425 fi 426 fi 414 427 # FIXME: Replace `main' with a function in `-lm': 415 428 AC_CHECK_LIB([m], [main]) -
orxonox/branches/updater/src/gui/orxonox_gui_update.cc
r3282 r3283 318 318 void* OrxonoxGuiUpdate::downloadThread(void* fileInfo) 319 319 { 320 #ifdef HAVE_PTHREAD_H 320 321 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); 321 322 gdk_threads_enter(); 323 #endif /* HAVE_PTHREAD_H */ 322 324 FileInfo* info = (FileInfo*)fileInfo; 323 325 info->stateButton->disconnectSignal(info->buttonSignal); … … 325 327 #ifdef HAVE_PTHREAD_H 326 328 info->stateButton->setTitle("cancel"); 329 gdk_threads_leave(); 327 330 #else /* HAVE_PTHREAD_H */ 328 331 info->stateButton->setTitle("please wait"); 329 332 #endif /* HAVE_PTHREAD_H */ 330 gdk_threads_leave();331 333 pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); 332 334 … … 343 345 #ifdef HAVE_PTHREAD_H 344 346 pthread_join (*downloadThreadID, NULL); 345 #endif /* HAVE_PTHREAD_H */346 347 gdk_threads_enter(); 348 #endif /* HAVE_PTHREAD_H */ 347 349 if (curlHandle) 348 350 curl_easy_cleanup(curlHandle); … … 358 360 info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, updateDataFunc); 359 361 isDownloading = false; 362 #ifdef HAVE_PTHREAD_H 360 363 gdk_threads_leave(); 364 #endif /* HAVE_PTHREAD_H */ 361 365 362 366 }
Note: See TracChangeset
for help on using the changeset viewer.