sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Commented out some old cruft in the Makefile which seemed to be unrelated

Browse Source 
to the Cygwin platform. This produced some silly error message about files
which haven't existed in the CVS repository for many months now. I can
remember seeing this message for at least a year and since it has *never*
changed I decided to investigate. Looks like unmaintained part of the
build system that nobody pays attention to but just in case I've left it
in tact with the following comment:

This code below seems outdated and doesn't even seem to apply to the
Windows platform. I've commented it out until someone can take a look at it
and confirm or deny. If it breaks anything blame Chris Burt / Desoto

Hopefully that's clear enough, but I really think this is a trivial change
and if after review nobody minds I'll simply erase the offending code.
This commit is contained in:
Chris Burt 2005-03-25 04:25:54 +00:00
parent b9da61202b
commit 3dd17cec3b
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/Makefile
View File

@ -444,26 +444,31 @@ ifeq ($(OS),windows)
SPLIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)winblender.res
SPLIB += $(NAN_ZLIB)/lib/libz.a
ifdef NAN_PLAYERSTATIC
PYPLAYERLIB = $(NAN_PYTHON)/static/python20.lib
BINTARGETS = blenderplayer
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_static.h)
ifneq (x$(PYINCLUDEOK),x)
DUMMY := $(shell cat gameengine/Ketsji/KX_Python_static.h > gameengine/Ketsji/KX_Python.h)
endif
else
PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_dynamic.h)
ifneq (x$(PYINCLUDEOK),x)
DUMMY := $(shell cat gameengine/Ketsji/KX_Python_dynamic.h > gameengine/Ketsji/KX_Python.h)
endif
endif
# This code below seems outdated and doesn't even seem to
# apply to the Windows platform. I've commented it
# out until someone can take a good look at it and confirm
# or deny. If it breaks anything blame Chris Burt / Desoto
#
#ifdef NAN_PLAYERSTATIC
# PYPLAYERLIB = $(NAN_PYTHON)/static/python20.lib
# BINTARGETS = blenderplayer
#
# NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
# NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
# NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
# NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
# NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
#
# PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_static.h)
# ifneq (x$(PYINCLUDEOK),x)
# DUMMY := $(shell cat gameengine/Ketsji/KX_Python_static.h > gameengine/Ketsji/KX_Python.h)
# endif
#else
# PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_dynamic.h)
# ifneq (x$(PYINCLUDEOK),x)
# DUMMY := $(shell cat gameengine/Ketsji/KX_Python_dynamic.h > gameengine/Ketsji/KX_Python.h)
# endif
#endif
endif
ifeq ($(NAN_JUST_BLENDERDYNAMIC),true)