View | Details | Raw Unified | Return to bug 239331 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +5 lines)
Lines 25-31 Link Here
25
# are set. We will pull boost in just to be on the safe side.
25
# are set. We will pull boost in just to be on the safe side.
26
26
27
# USES=compiler is needed to support gcc built archs
27
# USES=compiler is needed to support gcc built archs
28
USES=		cmake compiler:c++14-lang desktop-file-utils \
28
USES=		cmake compiler:c++14-lang desktop-file-utils gl \
29
		jpeg python:3.5 shebangfix
29
		jpeg python:3.5 shebangfix
30
USE_XORG=	x11 xext xfixes xmu xrender
30
USE_XORG=	x11 xext xfixes xmu xrender
31
USE_GL=		gl glu glew
31
USE_GL=		gl glu glew
Lines 39-44 Link Here
39
		release/scripts/modules/bl_i18n_utils/merge_po.py \
39
		release/scripts/modules/bl_i18n_utils/merge_po.py \
40
		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
40
		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
41
		release/scripts/modules/blend_render_info.py
41
		release/scripts/modules/blend_render_info.py
42
CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
43
CFLAGS_gcc=	-Wno-float-conversion
42
CFLAGS_i386=	-march=i586
44
CFLAGS_i386=	-march=i586
43
CXXFLAGS_i386=	-march=i586
45
CXXFLAGS_i386=	-march=i586
44
46
Lines 70-75 Link Here
70
COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
72
COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
71
				libpcre.so:devel/pcre
73
				libpcre.so:devel/pcre
72
COLLADA_USE=			GNOME=libxml2
74
COLLADA_USE=			GNOME=libxml2
75
COLLADA_USES=			gnome
73
COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
76
COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
74
CYCLES_IMPLIES=			OPENIMAGEIO
77
CYCLES_IMPLIES=			OPENIMAGEIO
75
CYCLES_CMAKE_BOOL=		WITH_CYCLES
78
CYCLES_CMAKE_BOOL=		WITH_CYCLES
Lines 137-142 Link Here
137
RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
140
RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
138
SDL_CMAKE_BOOL=			WITH_SDL
141
SDL_CMAKE_BOOL=			WITH_SDL
139
SDL_USE=			SDL=sdl2
142
SDL_USE=			SDL=sdl2
143
SDL_USES=			sdl
140
SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
144
SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
141
SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
145
SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
142
TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
146
TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF

Return to bug 239331