diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-11 06:50:02 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-11 06:50:02 +0400 |
| commit | ae9233a5b05ebfc925fd542afbdb3bb9220ed65c (patch) | |
| tree | 46ed278ee54325ca98540163edf9ea5dd4a88c7f /source/gameengine/GamePlayer/Makefile | |
| parent | d3e88eae711e2fd5d678ed555268647e28a9fc18 (diff) | |
1. Check material names passed to the physics engine (for collision sensors.)
Consider:
gameobj->getClientInfo()->m_auxilary_info = (matname ? (void*)(matname+2) : NULL);
It works if matname is "MAblah", but not if matname is "".
2. Added constructor for struct RAS_CameraData.
3. Added initializers to the struct KX_ClientObjectInfo constructor
4. Collision sensors won't detect near sensors.
5. A stack of minor tweaks, adjusting whitespace, using ++it for stl stuff.
Diffstat (limited to 'source/gameengine/GamePlayer/Makefile')
| -rw-r--r-- | source/gameengine/GamePlayer/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/GamePlayer/Makefile b/source/gameengine/GamePlayer/Makefile index fab44ad9bc7..c9a568f708d 100644 --- a/source/gameengine/GamePlayer/Makefile +++ b/source/gameengine/GamePlayer/Makefile @@ -37,6 +37,7 @@ SOURCEDIR = source/gameengine/GamePlayer DIR = $(OCGDIR)/gameengine/GamePlayer DIRS = common ghost +ifneq ($(NAN_NO_PLUGIN),true) ifeq ($(OS),$(findstring $(OS), "freebsd irix windows")) ifneq ($(FREE_WINDOWS),true) DIRS += netscape @@ -54,5 +55,6 @@ ifeq ($(OS),$(findstring $(OS), "solaris")) DIRS += netscape endif endif +endif include nan_subdirs.mk |