Commit Graph

172 Commits

Author SHA1 Message Date
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
Robert Osfield
0ebe473eb5 Further work on Occlusion Culling. Most of work is complete, just debugging
required now.
2002-06-13 16:21:00 +00:00
Robert Osfield
65a9a8043e Changes for MacOSX build, send in by Bob Kuehne. 2002-06-12 14:57:35 +00:00
Robert Osfield
d91b848a63 Checked in migration from osgUtil based GUIAdapter code to Neil Salter's
osgGA (Gui Abstraction).  This may break users code, but all it should
require to fix the builds should be a change from
osgUtil::CameraManipulator (etc) to osgGA::CameraManipulator and
include <osgUtil/CameraManipulator (etc) to osgGA/CameraManipulator and
the extra dependency of the link line.
2002-06-09 13:10:09 +00:00
Robert Osfield
177a09b47a Added image plugin library defs for IRIX, submission from Randall Hopper. 2002-05-10 19:30:48 +00:00
Don BURNS
b3979fa647 Fixed rpath nonsense in makedefs for Irix 2002-05-07 02:51:33 +00:00
Robert Osfield
ae8076f83b dded osg::ClipNode class for managing OpenGL clipping planes, and osgclip demo. 2002-05-02 00:14:40 +00:00
Robert Osfield
2bd20f5c6f Fixes for IRIX build.
Fix for a warning under VisualStudio.NET.
2002-04-25 22:09:28 +00:00
Robert Osfield
8f3debaf9b Changes for Mac OSX build, sent in by Bob Kuehne 2002-04-24 20:04:34 +00:00
Don BURNS
7f30ad780b changed LIBEXT to LIB_EXT for Darwin 2002-04-18 15:37:26 +00:00
Don BURNS
bef8dbbef3 Added -lXi to the Linux X_LIBS 2002-04-18 15:16:59 +00:00
Don BURNS
b76888ffb9 Changed Linux makedepend flag from -MM to -M 2002-04-16 21:39:45 +00:00
Don BURNS
906f1de294 Fixed Solaris 'make distribution' for demo source. 2002-04-16 04:13:30 +00:00
Don BURNS
f69e1276a9 fixed a few problems that didn't work right with installing demo source
on platforms other than Solaris.
2002-04-16 03:24:41 +00:00
Robert Osfield
9fd7c528f4 Compile fixes for IRIX, submitted by Randall Hopper. 2002-04-15 21:48:43 +00:00
Don BURNS
c984749457 Added Daniel Sjölie's request to use a default complier (CXX) in makedefs.
Doing this only for Linux
2002-04-15 14:45:14 +00:00
Don BURNS
e4d52cd1e6 added 'make cleandepend' to build system. 2002-04-12 05:09:45 +00:00
Robert Osfield
360247225e Added new osg::DrawPixels class with encapsulates glDrawPixels as and
osg::Drawable.  Added osg::Image::readPixels to osg::Image.

Made osg::LightSource to default to cullActive set to false to that LightSource
nodes don't get culled by default.
2002-04-10 21:51:34 +00:00
Don BURNS
ef15655ea3 Added (previously omitted) libpng, libjpeg, libtiff, libgif to makedefs
in the Linux section
2002-04-10 01:29:45 +00:00
Don BURNS
30eab4b79a Added pkgadd distribution for Solaris.
Added a cleaner way to install demo source so that installed versions use a
simplified makedefs/makerules.

Small fix to get osgText to compile with Solaris CC.  Constructor declared
with a non-const argument, but implemented with const argument.
2002-04-09 14:55:38 +00:00
Don BURNS
055e056645 Added -lstdc++ to begining of LIBS on link line.. ?? 2002-04-08 16:50:13 +00:00
Don BURNS
161adea396 Put quotes around "DBGF" for multi argument 2002-04-08 16:25:45 +00:00
Don BURNS
1a51045ea4 Added a stop gap fix for cygwin build. Previous experiements were creating
library and  plugin files that looked like system library and system files
which would have deleted original files on a 'make install'.  Cygwin is not
tested yet, but this needed to get fixed before a cygwin user wiped out his
system library files.
2002-04-07 17:47:03 +00:00
Don BURNS
87b7f48453 Edited INSTALL for new make and installation procedures.
Checking in a fix for Norman Vine
Added helprules and help.sh for a long-winded help message if you
'make help'.
2002-04-05 01:52:15 +00:00
Don BURNS
893dc6d65c Added Norman Vine's changes for CYGWIN builds
Added distrules and makerpms for building RPM distributions

Removed old RedHatRPM distribution build directory

Added new dist/RPM directory and placed temporary .spec files (these
are generated by Make/makerpms and are not intended for stand-alone
use, but they keep the directory warm and CVS happy)
2002-04-04 18:01:44 +00:00
Don BURNS
765d2f2183 Cleaned up in stallation directives 2002-04-03 17:53:46 +00:00
Don BURNS
e0adca775b Reinstated Norman Vine's TARGET_BASENAME variable in the makefiles and
added prefixes and suffixes to libs and plugins.  ALl this to accomodate
cygwin...

Also added INST_SYS_PREFIX and INST_SHARE_PREFIX for installation, as well
as "standardizing" the install locations for the various platforms.
2002-04-03 17:42:12 +00:00
Don BURNS
12043abd40 Oops forgot to add makedefs and makerules 2002-04-02 06:58:18 +00:00