FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for the Cygwin build related to the new FileUtils_Unix not using the

Browse Source 
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:
Robert Osfield
2002-04-24 08:50:03 +00:00
parent 37c98c1eaf
commit 20b5e59dfd
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
TOPDIR = . TOPDIR = .
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
DIRS = $(TOP_LEVEL_DIRS) DIRS = $(TOP_LEVEL_DIRS)

6
include/osg/Version
View File

@@ -10,8 +10,8 @@
extern "C" { extern "C" {
/** /**
* getVersion_osg() returns the library version number. * osgGetVersion() returns the library version number.
* Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osg. * Numbering convention : OpenSceneGraph-0.8-31 will return 0.8.31 from osgGetVersion.
* *
* This C function can be also used to check for the existence of the OpenSceneGraph * This C function can be also used to check for the existence of the OpenSceneGraph
* library using autoconf and its m4 macro AC_CHECK_LIB. * library using autoconf and its m4 macro AC_CHECK_LIB.
@@ -28,7 +28,7 @@ extern "C" {
extern SG_EXPORT const char* osgGetVersion(); extern SG_EXPORT const char* osgGetVersion();
/** /**
* getLibraryName_osg() returns the library name in human friendly form. * osgGetLibraryName() returns the library name in human friendly form.
*/ */
extern SG_EXPORT const char* osgGetLibraryName(); extern SG_EXPORT const char* osgGetLibraryName();

2
src/Demos/Makefile
View File

@@ -1,6 +1,6 @@
TOPDIR = ../.. TOPDIR = ../..
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
DIRS = $(DEMOS_DIRS) DIRS = $(DEMOS_DIRS)

2
src/Makefile
View File

@@ -1,6 +1,6 @@
TOPDIR = .. TOPDIR = ..
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
DIRS = $(SRC_DIRS) DIRS = $(SRC_DIRS)

13
src/osgDB/FileUtils_Unix.cpp
View File

@@ -219,14 +219,23 @@ char *osgDB::findDSO( const char *name )
} }
#endif #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" ))) if( (ptr = getenv( "LD_LIBRARY_PATH" )))
{ {
strcat( path, PathDelimitor ); strcat( path, PathDelimitor );
strcat( path, ptr ); strcat( path, ptr );
} }
#endif #endif
// check existance of dso assembled direct paths. // check existance of dso assembled direct paths.

2
src/osgPlugins/Makefile
View File

@@ -1,6 +1,6 @@
TOPDIR = ../.. TOPDIR = ../..
include $(TOPDIR)/Make/makedefs
include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedirdefs
include $(TOPDIR)/Make/makedefs
DIRS = $(PLUGIN_DIRS) DIRS = $(PLUGIN_DIRS)