1
0
Fork 0

Tweaks so tile loading still works in non-threaded mode.

This commit is contained in:
curt 2001-04-17 05:21:56 +00:00
parent 9bc25d9ce3
commit 051e2a6dc3
3 changed files with 12 additions and 2 deletions

View file

@ -29,6 +29,9 @@
#include "tileentry.hxx"
#include "tilemgr.hxx"
extern ssgBranch *terrain;
extern ssgBranch *ground;
/**
*
*/
@ -87,6 +90,7 @@ FGTileLoader::add( FGTileEntry* tile )
tile_queue.push( tile );
#else
tile->load( tile_path, true );
tile->add_ssg_nodes( terrain, ground );
#endif // ENABLE_THREADS
}

View file

@ -77,11 +77,13 @@ private:
private:
#ifdef ENABLE_THREADS
/**
* FIFO queue of tiles to load from data files.
*/
SGBlockingQueue< FGTileEntry* > tile_queue;
#endif
/**
* Base name of directory containing tile data file.
*/

View file

@ -1,4 +1,5 @@
bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-up
bin_PROGRAMS = est-epsilon gl-info test-gethostname test-mktime test-text \
test-up
est_epsilon_SOURCES = est-epsilon.c
est_epsilon_LDADD = $(base_LIBS)
@ -12,5 +13,8 @@ test_gethostname_LDADD = $(base_LIBS)
test_mktime_SOURCES = test-mktime.cxx
test_mktime_LDADD = $(base_LIBS)
test_text_SOURCES = test-text.cxx
test_text_LDADD = $(base_LIBS)
test_up_SOURCES = test-up.cxx
test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS)