1
0
Fork 0

More default setup for FG_ROOT

Modified Files:
	fgviewer/Makefile.am fgviewer/fgviewer.cxx
This commit is contained in:
frohlich 2009-06-04 04:30:51 +00:00 committed by Tim Moore
parent 49b42a171a
commit dd66e37353
2 changed files with 7 additions and 0 deletions

View file

@ -1,3 +1,6 @@
AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
bin_PROGRAMS = fgviewer bin_PROGRAMS = fgviewer
fgviewer_SOURCES = fgviewer.cxx fgviewer_SOURCES = fgviewer.cxx

View file

@ -81,7 +81,11 @@ main(int argc, char** argv)
if (fg_root_env) if (fg_root_env)
fg_root = fg_root_env; fg_root = fg_root_env;
else else
#if defined(PKGDATADIR)
fg_root = PKGDATADIR;
#else
fg_root = "."; fg_root = ".";
#endif
osgDB::FilePathList filePathList; osgDB::FilePathList filePathList;
filePathList.push_back(fg_root); filePathList.push_back(fg_root);