Fix for the Cygwin build related to the new FileUtils_Unix not using the
Windows PATH environmental variable for searching for libraries. Sent in by Norman Vine. Reoder of the makedefs/makedirdefs to fix Mac OSX compilation. Sent in by Bob Kuehne.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
TOPDIR = ../..
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
include $(TOPDIR)/Make/makedirdefs
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
|
||||
DIRS = $(DEMOS_DIRS)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPDIR = ..
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
include $(TOPDIR)/Make/makedirdefs
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
|
||||
DIRS = $(SRC_DIRS)
|
||||
|
||||
|
||||
@@ -219,14 +219,23 @@ char *osgDB::findDSO( const char *name )
|
||||
}
|
||||
#endif
|
||||
|
||||
#else
|
||||
#elif defined(__CYGWIN__)
|
||||
|
||||
if ((ptr = getenv( "PATH" )))
|
||||
{
|
||||
notify(DEBUG_INFO) << "PATH = "<<ptr<<std::endl;
|
||||
strcat( path, PathDelimitor );
|
||||
strcat( path, ptr );
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if( (ptr = getenv( "LD_LIBRARY_PATH" )))
|
||||
{
|
||||
strcat( path, PathDelimitor );
|
||||
strcat( path, ptr );
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
// check existance of dso assembled direct paths.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
TOPDIR = ../..
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
include $(TOPDIR)/Make/makedirdefs
|
||||
include $(TOPDIR)/Make/makedefs
|
||||
|
||||
DIRS = $(PLUGIN_DIRS)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user