Commit Graph

177 Commits

Author SHA1 Message Date
Don BURNS
a194d00518 Small change by Eric Sokolowsky to change TIFF_LIBS to TIFF_LIB for Mac build 2004-10-25 20:04:52 +00:00
Don BURNS
12a1ef5552 don - Small changes to support Mac OSX CGL build
small unused variable warning fix.
2004-10-24 05:50:59 +00:00
Don BURNS
289d838322 Fixed a mis-definition of INSTBIN and INSTLIB 2004-09-02 03:52:13 +00:00
Don BURNS
3e74db50e5 Changes for IRIX build and fix to build system 2004-08-28 23:04:47 +00:00
Don BURNS
45313a0aae Robert must've forgotten to set VERSION_REVISION back to 0 after
tagging the release
2004-08-24 21:35:41 +00:00
Robert Osfield
c2a4f696f0 Bumped up the revision number to 2 for the 0.9.7-2 release 2004-08-18 10:07:02 +00:00
Robert Osfield
a6c8ea6806 Set revision number back to 0. 2004-08-09 15:12:00 +00:00
Robert Osfield
2ac669bea4 Set version to 0.9.7-1 2004-08-09 15:08:30 +00:00
Robert Osfield
2754f46c5d From Bob Kuehne, change the FREETYPE_INCLUDE and _LIB to hardcoded
version to avoid reliance on freetype-config.
2004-08-06 19:55:36 +00:00
Robert Osfield
4340a0a1e4 From Bob Kuehne, adding of SDKPATH to OSX build 2004-08-06 09:35:08 +00:00
Robert Osfield
e59fcfe6ce Cleaned up the gdal-config usage to work with gdal-1.1.9 2004-08-04 10:03:57 +00:00
Robert Osfield
b03d3e3a58 Added support for setting custom dependencies 2004-08-04 09:20:28 +00:00
Robert Osfield
7eb3f2646e From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin 2004-08-04 08:27:43 +00:00
Robert Osfield
701f93c615 Added PROFILER support under Linux for gprof and FunctionCheck 2004-08-01 04:06:07 +00:00
Robert Osfield
90579a0e17 Fixes for FreeBSD 2004-05-12 20:31:58 +00:00
Don BURNS
29cee0c15f Applied Norman Vine's changes for Cygwin/Mingw 2004-03-25 18:34:40 +00:00
Robert Osfield
bd37f999c4 From Bob Kuehne, change on __DARWIN_OSX__ define to __APPLE__ 2004-03-08 11:02:05 +00:00
Robert Osfield
fa1a9f4060 Removed slideshow3D from list of example apps, and rejigged makedefs handling
of the QUICK_TIME
2004-02-05 10:10:18 +00:00
Robert Osfield
75f8eb2cff Removed DRAWIN_QUICKTIME definition 2004-02-05 09:24:52 +00:00
Robert Osfield
996d292979 Changes to help differentiate between OSX using Quicktime vs not using
quicktime, from Eric Sokolosky and Robert Osfield.
2004-02-03 22:46:10 +00:00
Robert Osfield
0edb480129 From Bob Kuehne, build fixes for OSX. 2003-12-17 23:19:11 +00:00
Robert Osfield
c6cd8edf3f From Jeremy Bell, made SHARED = -dynamic for OSX. 2003-12-17 10:05:29 +00:00
Robert Osfield
eae83d6a4e Returned revision number to 0, for main development work 2003-10-02 14:46:07 +00:00
Robert Osfield
1af9f7f82a Updated the revsion number to 2, for the 0.9.6-2 release. 2003-10-02 14:43:39 +00:00
Robert Osfield
dc674e9b20 From Bob Kuehne, added extra include for freetype to find it on OSX. 2003-09-22 21:22:16 +00:00
Robert Osfield
d45fcb5613 From Alberto Farre, added support for GL_EXT_blend_color, GL_ARB_multisample,
GL_NV_multisample_filter_hint extension in the form of osg::BlendColor and
osg::Multisample state attribute classes.
2003-09-17 12:04:48 +00:00
Robert Osfield
10bf07ce06 Updated Make/makedefs version number to 0.9.6-1. 2003-09-16 21:26:19 +00:00
Robert Osfield
b67acdfe7f Changed the FREETYPE_LIB under Cygwin from ft freetype2 to freetype 2003-09-13 16:43:34 +00:00
Robert Osfield
890af11e75 From Norman Vine, fixes for Cygwin and Mingw builds. 2003-09-12 21:05:40 +00:00
Robert Osfield
d8caec91a4 Clean ups for the release. 2003-09-11 09:44:22 +00:00
Robert Osfield
e84a6a62d7 Added -I/sw/include to Make/makedefs 2003-09-10 20:24:49 +00:00
Robert Osfield
c1166cf3d5 Addeed LIBXML2_INCLUDE defined to Make/makedefs to handle non standard placement of
libxml2 in OSX.
2003-09-10 19:55:14 +00:00
Robert Osfield
f8107a39b9 Build Fixes for IRIX. 2003-09-04 08:50:06 +00:00
Robert Osfield
8d5aa5644d Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it. 2003-08-18 10:58:30 +00:00
Robert Osfield
07f120fb1c Fixes to Cygwin/Mingw makedefs.
Converted unix line endinges to dos line endings in various VS project files.
2003-08-16 20:42:54 +00:00
Robert Osfield
6a25da37f2 Added -lOpenThreads to the IRIX OTHER_LIBS definition. 2003-08-12 23:36:40 +00:00
Don BURNS
d6820a3f2b updates makedefs and makerules for Mac OSX submitted by Bob Kuehne 2003-08-08 14:41:37 +00:00
Robert Osfield
e7abf75ab0 Post release revision change. 2003-07-26 23:44:55 +00:00
Don BURNS
9c81de9c12 Small typo 2003-07-26 22:44:04 +00:00
Don BURNS
8ff217576a Removed command line definitions of OSG_VERSION and OSG_RELEASE 2003-07-26 00:12:17 +00:00
Don BURNS
49a93076c1 Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the
local makefiles.

Small change in txp loader for sun build
2003-07-25 23:49:03 +00:00
Don BURNS
9a2a13fe34 Added conditionals to find OpenThreads include and library directories if
not installed
2003-07-23 19:08:42 +00:00
Robert Osfield
cc529aebe0 Bumped up version numbers in preperation for the 0.9.5 release. 2003-07-23 08:54:29 +00:00
Robert Osfield
8f04a26cfd Added -lOpenThreads to the OSX defines. 2003-07-21 10:11:34 +00:00
Don BURNS
56a13abc05 Updated OSG to use OpenThreads. Moved any references to OpenThread to
OpenThreads and removed any dependency on Producer threads, Mutexes, etc.
2003-07-19 00:18:07 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
0036018507 Added -I/usr/X11R6/include to osgProducer and all the examples GNUMakefiles.
From Bob, mods to GNUMakefile and Make/makedefs for the extra includes for
freetype.
2003-04-14 19:39:22 +00:00
Robert Osfield
026dc2cbb7 Added Geoff Michel's osgpick and osgUtil::PickVisitor code. 2003-04-13 13:26:41 +00:00
Robert Osfield
c2a9234cc5 Updated the version numbers to 0.9.4 2003-04-11 10:04:53 +00:00
Robert Osfield
fb49e5a60f Removal of trailing \ from end of couple lines in cygwin path. 2003-04-04 15:22:25 +00:00
Robert Osfield
161c40d75f Removed OSX override override of PLUGIN_DIRS. 2003-04-02 14:54:05 +00:00
Robert Osfield
190c32c73a Moved demo references acros to being example references. 2003-03-27 18:56:23 +00:00
Don BURNS
5b1969563b Fixed installation of demo source from src/Demos to examples 2003-03-27 18:42:31 +00:00
Don BURNS
f060051183 changes to makedefs to support AMD 64 bit 2003-03-24 23:02:08 +00:00
Robert Osfield
f9c82c9bbb Duplicated the handling of 64 bit linux builds for ia64 and x86_64 and placed
them under the seperate paths for Intel vs GNU compilers.
2003-03-20 22:13:10 +00:00
Robert Osfield
2c018b841f Added -m64 -DARCH64 option to Linux 64 bit build. 2003-03-20 21:26:54 +00:00
Don BURNS
e978c405e1 Set VERSION_RELEASE back to 3, replaced guards in include/osg/Verson to
OSG_VERSION_ with trailing underscore
2003-03-18 20:02:02 +00:00
Don BURNS
a5d713ba1f Added support for versioning to the build system 2003-03-18 18:40:19 +00:00
Robert Osfield
f811b2580e Removed osgGLUT and Demos/*.
Integrated Marco's updated examples/*/*.dsp's.
2003-03-15 20:20:46 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
693a889ece Various changes to the BUILD system:
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
       $(OS)$(ARCH).Debug for OS's that support both architectures.
          eg.  Linux32.Opt and Linux32.Debug

     o Libraries links are now placed in lib/$(OS)$(ARCH)
          eg.  lib/Linux32/

     o Binaries are now placed in bin/$(OS)$(ARCH)
          eg. bin/Linux32

     o 'make install' and 'make instlinks' now place files/links in
       /usr/local/{include,lib,share/OpenSceneGraph} by default on
       most systems (Solaris still goes in /opt/OpenSceneGraph).
       Rather than having the somwehat confusing INST_SYS_PREFIX and
       INST_SHARE_PREFX, you can override these with just
            INST_LOCATION
       For example,
             make INST_LOCATION=/usr
       will place files at /usr/include, /usr/lib,
       /usr/share/OpenSceneGraph.
2003-03-13 02:53:40 +00:00
Robert Osfield
c0b3bb1f32 Moved the platform specific directory defs out of makedefs into makediredefs,
and have standardised onto single instances where possible.
2003-03-12 14:01:49 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*.
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
2003-03-12 10:39:43 +00:00
Don BURNS
9bd3d0cd06 added directives for intel compilers 2003-03-05 19:31:55 +00:00
Don BURNS
cb7f71b174 From Tom Jolley:
I was converting a pfb file to osg and had trouble with a missing image
library.  I added -all in front of -limage where PFLIBS is defined in
Make/makedefs to solve my problem.
2003-02-11 19:23:19 +00:00
Robert Osfield
6ecc3537e5 From Ulrich, change to the pflib includes for Performer under Linux to solve
problem loading pf datasets.
2003-01-22 23:40:47 +00:00
Don BURNS
d9ee2d0335 Added gstabs+ to DBGF in Linux in makedefs 2003-01-15 21:54:42 +00:00
Robert Osfield
00cc3a1833 Converted the instance of osgNew and osgDelete back to new and delete as part
of depecating the include/osg/MemoryManager
2002-12-16 13:40:58 +00:00
Robert Osfield
0467a8af09 Fixes from IRIX build from Bob Kuehne. 2002-12-10 21:18:16 +00:00
Don BURNS
c259cadd6d Fixed endif placement for SunOS build 2002-12-10 17:57:02 +00:00
Don BURNS
1f89a68ec8 Typo png was npg 2002-12-06 19:56:17 +00:00
Robert Osfield
17683eaacc Update from Norman Vine for Cygin gcc3.2 support. 2002-12-06 09:41:53 +00:00
Robert Osfield
264cca1317 Fixed the ifeq ($(OS),SunOS) so it was correctly on its own seperate line, and
complimented by the required endif
2002-12-03 10:19:37 +00:00
Don BURNS
d87754857f updated difference between forte compilers and gnu compilers on Solaris 2002-12-02 19:37:43 +00:00
Robert Osfield
6c8ef3b7df Fixed the texture apply method which was broken yesterday, the new code wasn't
checking for the validity of _image before doing checks on it.  This breaks when
render to texture is used as there is no image to check against...

Added osgshadowtexture demo source.  Demos still in development, so don't expect
any shadows yet...
2002-11-20 07:46:25 +00:00
Robert Osfield
4ae3e5c6bc Updated OSX defs to compile osgSim and osglightpoint 2002-11-19 12:26:51 +00:00
Robert Osfield
8e84722f90 Added LEFT_EYE and RIGHT_EYE stereo to osg::DisplaySettings/osgUtil::SceneView
Renamed LODBias to LODScale.
2002-11-12 10:22:38 +00:00
Robert Osfield
5c1c9ec0e9 Added missing demos and libs into the darwin defines. 2002-11-11 09:06:02 +00:00
Robert Osfield
b2fa76bb77 Fixes for MING build 2002-11-11 08:05:07 +00:00
Don BURNS
e1e0547dfd Added ARCH64 def for 64 bit builds 2002-10-24 20:45:44 +00:00
Don BURNS
d2a3bed549 USE_MM was not defined for IRIX 2002-10-17 21:25:56 +00:00
Robert Osfield
f7c7740327 Changed the linux linking of -lgif to -lungif.
Fixed a typo in the Images name.
2002-09-24 20:14:08 +00:00
Don BURNS
c4e7526f69 For Solaris, /usr/local/lib dependencies now compile static libraries. This
reduces the dependencies for binary installs.  ALso rearranged the SunOS
gnu and Forte compiler sections to be more generic
2002-09-05 15:13:05 +00:00
Don BURNS
78a86984f1 Added the script to make IRIX distribution packages (via 'inst'). 2002-08-31 06:04:21 +00:00
Robert Osfield
a68d95d2f6 Updates to windows build docs.
Merge fixes for OSX from bob.

Added checking for impostor sprites into stats.
2002-08-30 16:17:41 +00:00
Robert Osfield
8d7acb9437 Removed the OSG_COMPILE_UNIT_TESTS define from the OSX build to avoid
issues with the missing <sstream>
2002-08-30 07:17:48 +00:00
Robert Osfield
7d6197441e Added Neil Salter's osgUtx library into the distribution, have put all the
orignal seperate headers and source into include/osg/UnitTestFrameWork
and src/osg/UnitTestFramework.cpp respectively.  I have done this to
keep the include and source directories focused on the scene graph rather
than the test framework.

Have added a very simple unit test to Vec3.cpp, which are optionally
compiled in with the OSG_COMPILE_UNIT_TESTS define, which is only
currently defined in debug builds under unix.  It should be fine to
add it in under Windows project files as well.

Finally, a new demo app osgunittests runs the tests and reports success
or failure of the tests.
2002-08-28 14:26:09 +00:00
Robert Osfield
83af5e7a95 Added osgtexture3D demo, renamed osgtexture demo to osgtexture2D, and have
added osgtexture1D demo which currently is simply copy of osgtexture2D. I
will be modifying it to do 1D texturing next.

Fixed a bug in osg::Texture3D relating to checking of existance of
texturing.

Merged some fixes to the pfb loader from Ulrich Hertlein.
2002-08-27 10:06:57 +00:00
Robert Osfield
2ecdb629e6 Removed double quotes from around the :
DBGF              = -g -DOSG_USE_MEMORY_MANAGER

As this was breaking the build.
2002-07-25 14:42:01 +00:00
Robert Osfield
6d690740a6 Mods for HP-UX port. 2002-07-23 15:01:51 +00:00
Robert Osfield
a41930ed17 Support added for Gnu C++ under Solaris. 2002-07-23 13:30:47 +00:00
Robert Osfield
80afddc08d Checked in Tino Schwarze's port to HP-UX. 2002-07-23 10:48:22 +00:00
Robert Osfield
f55233b20d Updates from Bob Kuehne and Kristopher Bixler to remove the fink
dependency from the MacOSX build.
2002-07-16 19:21:31 +00:00
Robert Osfield
a389dfef8b Fixes for MacOSX build from Bob Kuehne. 2002-07-16 15:13:57 +00:00
Don BURNS
c0360c15bc added -lpthread to the link line for Linux builds. Seems Red Hat 7.3
turns up undefined symbols without it.
2002-07-11 23:30:18 +00:00
Robert Osfield
f80a7e05b1 Added osgGA to the MIGNW makedefs. 2002-07-04 14:23:58 +00:00
Don BURNS
88a62173d2 -n32 and -64 entries were reversed in makedefs 2002-07-02 15:01:46 +00:00
Don BURNS
0443d4cffa More 64 bit build specifics in IRIX makedefs file 2002-07-01 14:40:09 +00:00
Don BURNS
edb702b8df Removed -ldl from makedefs for IRIX 2002-07-01 14:20:37 +00:00
Robert Osfield
156a9fbaea Fixes for Visual .NET and Mingw builds, and fix MacOSX notify() crash. 2002-06-15 20:57:50 +00:00