Removed slideshow3D from list of example apps, and rejigged makedefs handling
of the QUICK_TIME
This commit is contained in:
parent
75f8eb2cff
commit
fa1a9f4060
@ -2,7 +2,6 @@
|
||||
# Dependency library which have been installed on this system
|
||||
|
||||
GDAL_INSTALLED = yes
|
||||
LIBXML2_INSTALLED = yes
|
||||
JASPER_INSTALLED = yes
|
||||
|
||||
FREETYPE_INSTALLED = yes
|
||||
|
@ -413,15 +413,17 @@ ifeq ($(OS),Darwin)
|
||||
LIBVERSION = -current_version $(VERSION) \
|
||||
-compatibility_version \
|
||||
$(VERSION_MAJOR).$(VERSION_MINOR).0
|
||||
|
||||
ifeq ($(DARWIN_QUICKTIME),yes)
|
||||
QUICKTIME = -framework QuickTime $(CARBON_LIB)
|
||||
DEF += -DDARWIN_QUICKTIME
|
||||
else
|
||||
PNG_LIBS = -lpng -lz
|
||||
JPEG_LIBS = -ljpeg
|
||||
GIF_LIBS = -lungif
|
||||
TIFF_LIBS = -ltiff -lz -ljpeg
|
||||
endif
|
||||
|
||||
QUICKTIME = -framework QuickTime $(CARBON_LIB)
|
||||
PNG_LIBS = -lpng -lz
|
||||
JPEG_LIBS = -ljpeg
|
||||
GIF_LIBS = -lungif
|
||||
TIFF_LIBS = -ltiff -lz -ljpeg
|
||||
|
||||
endif
|
||||
|
||||
#### Cygwin/Mingw specific definitions
|
||||
|
@ -189,10 +189,6 @@ ifeq ($(LIBMPEG3_INSTALLED),yes)
|
||||
EXAMPLE_DIRS += osgmovie
|
||||
endif
|
||||
|
||||
ifeq ($(LIBXML2_INSTALLED),yes)
|
||||
EXAMPLE_DIRS += slideshow3D
|
||||
endif
|
||||
|
||||
ifeq ($(DEMETER_INSTALLED),yes)
|
||||
EXAMPLE_DIRS += osgdemeter
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user