forked from bartvdbraak/blender
== FFMPEG ==
Added Cygwin / mingw default location also
This commit is contained in:
parent
63a1f2515e
commit
347df56270
14
extern/Makefile
vendored
14
extern/Makefile
vendored
@ -1,5 +1,9 @@
|
|||||||
#
|
#
|
||||||
|
<<<<<<< Makefile
|
||||||
# $Id$
|
# $Id$
|
||||||
|
=======
|
||||||
|
# $Id$
|
||||||
|
>>>>>>> 1.18
|
||||||
#
|
#
|
||||||
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
||||||
#
|
#
|
||||||
@ -34,7 +38,7 @@ include nan_definitions.mk
|
|||||||
|
|
||||||
SOURCEDIR = extern
|
SOURCEDIR = extern
|
||||||
DIR = $(OCGDIR)/extern
|
DIR = $(OCGDIR)/extern
|
||||||
DIRS =
|
DIRS = qhull/src solid
|
||||||
|
|
||||||
ifeq ($(WITH_FREETYPE2), true)
|
ifeq ($(WITH_FREETYPE2), true)
|
||||||
DIRS += bFTGL/src
|
DIRS += bFTGL/src
|
||||||
@ -44,13 +48,19 @@ ifeq ($(WITH_FFMPEG), true)
|
|||||||
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
|
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
|
||||||
DIRS += ffmpeg
|
DIRS += ffmpeg
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
|
||||||
|
DIRS += ffmpeg
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(NAN_NO_KETSJI), true)
|
ifneq ($(NAN_NO_KETSJI), true)
|
||||||
DIRS += qhull/src solid bullet
|
DIRS += bullet
|
||||||
endif
|
endif
|
||||||
|
|
||||||
TARGET =
|
TARGET =
|
||||||
|
ifneq ($(OS),irix)
|
||||||
|
TARGET=solid
|
||||||
|
endif
|
||||||
|
|
||||||
all::
|
all::
|
||||||
@[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern
|
@[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern
|
||||||
|
Loading…
Reference in New Issue
Block a user