diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-06-25 23:15:50 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-06-25 23:15:50 +0400 |
| commit | 347df562703ae9b01e73ec2c5526e987e389a815 (patch) | |
| tree | db360ce0ad2fd7d5961306b1cdab66d6d7b25f8b /extern/Makefile | |
| parent | 63a1f2515e92a496120b216a1bf2005997332d4d (diff) | |
== FFMPEG ==
Added Cygwin / mingw default location also
Diffstat (limited to 'extern/Makefile')
| -rw-r--r-- | extern/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/extern/Makefile b/extern/Makefile index 29a39ed55e8..c7d6c647457 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -1,5 +1,9 @@ # +<<<<<<< Makefile # $Id$ +======= +# $Id$ +>>>>>>> 1.18 # # ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** # @@ -34,7 +38,7 @@ include nan_definitions.mk SOURCEDIR = extern DIR = $(OCGDIR)/extern -DIRS = +DIRS = qhull/src solid ifeq ($(WITH_FREETYPE2), true) DIRS += bFTGL/src @@ -44,13 +48,19 @@ ifeq ($(WITH_FFMPEG), true) ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg) DIRS += ffmpeg endif +ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg) + DIRS += ffmpeg +endif endif ifneq ($(NAN_NO_KETSJI), true) - DIRS += qhull/src solid bullet + DIRS += bullet endif TARGET = +ifneq ($(OS),irix) + TARGET=solid +endif all:: @[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern |