forked from bartvdbraak/blender
Commented out some old cruft in the Makefile which seemed to be unrelated
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:
parent
b9da61202b
commit
3dd17cec3b
@ -444,26 +444,31 @@ ifeq ($(OS),windows)
|
|||||||
SPLIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)winblender.res
|
SPLIB += $(OCGDIR)/blender/icons/$(DEBUG_DIR)winblender.res
|
||||||
SPLIB += $(NAN_ZLIB)/lib/libz.a
|
SPLIB += $(NAN_ZLIB)/lib/libz.a
|
||||||
|
|
||||||
ifdef NAN_PLAYERSTATIC
|
# This code below seems outdated and doesn't even seem to
|
||||||
PYPLAYERLIB = $(NAN_PYTHON)/static/python20.lib
|
# apply to the Windows platform. I've commented it
|
||||||
BINTARGETS = blenderplayer
|
# out until someone can take a good look at it and confirm
|
||||||
|
# or deny. If it breaks anything blame Chris Burt / Desoto
|
||||||
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
#
|
||||||
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
|
#ifdef NAN_PLAYERSTATIC
|
||||||
NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
|
# PYPLAYERLIB = $(NAN_PYTHON)/static/python20.lib
|
||||||
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
|
# BINTARGETS = blenderplayer
|
||||||
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
#
|
||||||
|
# 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)
|
# NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
|
||||||
ifneq (x$(PYINCLUDEOK),x)
|
# NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
|
||||||
DUMMY := $(shell cat gameengine/Ketsji/KX_Python_static.h > gameengine/Ketsji/KX_Python.h)
|
# NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
|
||||||
endif
|
# NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
|
||||||
else
|
#
|
||||||
PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_dynamic.h)
|
# PYINCLUDEOK := $(shell diff -qbB gameengine/Ketsji/KX_Python.h gameengine/Ketsji/KX_Python_static.h)
|
||||||
ifneq (x$(PYINCLUDEOK),x)
|
# ifneq (x$(PYINCLUDEOK),x)
|
||||||
DUMMY := $(shell cat gameengine/Ketsji/KX_Python_dynamic.h > gameengine/Ketsji/KX_Python.h)
|
# DUMMY := $(shell cat gameengine/Ketsji/KX_Python_static.h > gameengine/Ketsji/KX_Python.h)
|
||||||
endif
|
# endif
|
||||||
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
|
endif
|
||||||
|
|
||||||
ifeq ($(NAN_JUST_BLENDERDYNAMIC),true)
|
ifeq ($(NAN_JUST_BLENDERDYNAMIC),true)
|
||||||
|
Loading…
Reference in New Issue
Block a user