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

== FFMPEG ==

Browse Source 
Added Cygwin / mingw default location also
This commit is contained in:
Peter Schlaile 2006-06-25 19:15:50 +00:00
parent 63a1f2515e
commit 347df56270
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extern/Makefile vendored
View File

@ -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