forked from bartvdbraak/blender
It seems that some darwin bundle creation routines were being performed
when building for cygwin. Please test.
This commit is contained in:
parent
244c925421
commit
36e3a7bb7e
@ -547,8 +547,9 @@ endif
|
|||||||
ifdef NAN_BUILDINFO
|
ifdef NAN_BUILDINFO
|
||||||
/bin/rm $(BUILDINFO_O)
|
/bin/rm $(BUILDINFO_O)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), darwin)
|
||||||
@$(MAKE) -C darwin/ APPLICATION=blenderstatic
|
@$(MAKE) -C darwin/ APPLICATION=blenderstatic
|
||||||
|
endif
|
||||||
|
|
||||||
$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
|
$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
|
||||||
@echo "****> Link $@"
|
@echo "****> Link $@"
|
||||||
@ -560,8 +561,9 @@ endif
|
|||||||
ifdef NAN_BUILDINFO
|
ifdef NAN_BUILDINFO
|
||||||
/bin/rm $(BUILDINFO_O)
|
/bin/rm $(BUILDINFO_O)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), darwin)
|
||||||
@$(MAKE) -C darwin/ APPLICATION=blender
|
@$(MAKE) -C darwin/ APPLICATION=blender
|
||||||
|
endif
|
||||||
|
|
||||||
$(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT): $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB)
|
$(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT): $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB)
|
||||||
@echo "****> Link $@"
|
@echo "****> Link $@"
|
||||||
@ -573,7 +575,9 @@ endif
|
|||||||
ifdef NAN_BUILDINFO
|
ifdef NAN_BUILDINFO
|
||||||
/bin/rm $(BUILDINFO_O)
|
/bin/rm $(BUILDINFO_O)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), darwin)
|
||||||
@$(MAKE) -C darwin/ APPLICATION=blenderplayer
|
@$(MAKE) -C darwin/ APPLICATION=blenderplayer
|
||||||
|
endif
|
||||||
|
|
||||||
$(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT): $(OBJS) $(COMLIB) $(SPLIB)
|
$(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT): $(OBJS) $(COMLIB) $(SPLIB)
|
||||||
@echo "****> Link $@"
|
@echo "****> Link $@"
|
||||||
@ -585,7 +589,9 @@ endif
|
|||||||
ifdef NAN_BUILDINFO
|
ifdef NAN_BUILDINFO
|
||||||
/bin/rm $(BUILDINFO_O)
|
/bin/rm $(BUILDINFO_O)
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS), darwin)
|
||||||
@$(MAKE) -C darwin/ APPLICATION=blenderplayer
|
@$(MAKE) -C darwin/ APPLICATION=blenderplayer
|
||||||
|
endif
|
||||||
|
|
||||||
$(DIR)/$(DEBUG_DIR)bin/Blender3DPlugin$(SOEXT): $(PLUGAPPLIB_XPLINK)
|
$(DIR)/$(DEBUG_DIR)bin/Blender3DPlugin$(SOEXT): $(PLUGAPPLIB_XPLINK)
|
||||||
@echo "****> Link $@"
|
@echo "****> Link $@"
|
||||||
|
Loading…
Reference in New Issue
Block a user