Changeset 3273 in orxonox.OLD for orxonox/branches/updater/src
- Timestamp:
- Dec 24, 2004, 9:43:22 PM (20 years ago)
- Location:
- orxonox/branches/updater/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/updater/src/Makefile.in
r3271 r3273 282 282 esac; \ 283 283 done; \ 284 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/Makefile'; \284 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ 285 285 cd $(top_srcdir) && \ 286 $(AUTOMAKE) -- foreignsrc/Makefile286 $(AUTOMAKE) --gnu src/Makefile 287 287 .PRECIOUS: Makefile 288 288 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/updater/src/console/Makefile.in
r3271 r3273 201 201 esac; \ 202 202 done; \ 203 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/console/Makefile'; \203 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/console/Makefile'; \ 204 204 cd $(top_srcdir) && \ 205 $(AUTOMAKE) -- foreignsrc/console/Makefile205 $(AUTOMAKE) --gnu src/console/Makefile 206 206 .PRECIOUS: Makefile 207 207 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/updater/src/gui/Makefile.in
r3271 r3273 232 232 esac; \ 233 233 done; \ 234 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/gui/Makefile'; \234 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/gui/Makefile'; \ 235 235 cd $(top_srcdir) && \ 236 $(AUTOMAKE) -- foreignsrc/gui/Makefile236 $(AUTOMAKE) --gnu src/gui/Makefile 237 237 .PRECIOUS: Makefile 238 238 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/branches/updater/src/gui/orxonox_gui_update.cc
r3272 r3273 200 200 } 201 201 202 #ifdef HAVE_CURL 202 203 CURL* OrxonoxGuiUpdate::curlHandle = NULL; 204 #endif /* HAVE_CURL */ 205 206 #ifdef HAVE_PTHREAD_H 203 207 pthread_t* OrxonoxGuiUpdate::downloadThreadID = new pthread_t; 208 #endif /* HAVE_PTHREAD_H */ 204 209 bool OrxonoxGuiUpdate::isDownloading = false; 205 210 … … 217 222 strcpy (fileOnDisk, info->localRoot); 218 223 strcat (fileOnDisk, info->fileName); 219 pthread_t test; 224 220 225 if(curlHandle) 221 226 { … … 234 239 { 235 240 //! \todo check if threads really were created. 241 #ifdef HAVE_PTHREAD_H 236 242 pthread_create(downloadThreadID, NULL, downloadThread, info); 243 #else 244 downloadThread(info); 245 #endif /* HAVE_PTHREAD_H */ 246 237 247 // else 238 248 // PRINTF(1)("thread already in use\n"); … … 252 262 if (curlHandle) 253 263 curl_easy_cleanup(curlHandle); 254 264 #ifdef HAVE_PTHREAD_H 255 265 pthread_join(*downloadThreadID, NULL); 266 #endif /* HAVE_PTHREAD_H */ 256 267 PRINTF(3)("Closing the downloaded file.\n"); 257 268 fclose(info->fileHandle); -
orxonox/branches/updater/src/gui/orxonox_gui_update.h
r3272 r3273 14 14 #include <curl/easy.h> 15 15 #endif /* HAVE_CURL */ 16 #ifdef HAVE_PTHREAD_H 16 17 #include <pthread.h> 18 #endif /* HAVE_PTHREAD_H */ 17 19 using namespace std; 18 20 … … 64 66 static gint cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar); 65 67 #endif /* HAVE_GTK2 */ 68 #ifdef HAVE_PTHREAD_H 66 69 static pthread_t* downloadThreadID; 70 #endif /* HAVE_PTHREAD_H */ 67 71 static bool isDownloading; 68 72 -
orxonox/branches/updater/src/importer/Makefile.in
r3271 r3273 208 208 esac; \ 209 209 done; \ 210 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- foreignsrc/importer/Makefile'; \210 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/importer/Makefile'; \ 211 211 cd $(top_srcdir) && \ 212 $(AUTOMAKE) -- foreignsrc/importer/Makefile212 $(AUTOMAKE) --gnu src/importer/Makefile 213 213 .PRECIOUS: Makefile 214 214 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset
for help on using the changeset viewer.