Line
Link Here
|
0 |
-- a/configure.ac |
0 |
++ b/configure.ac |
Lines 1-6
Link Here
|
1 |
dnl Process this file with autoconf to produce a configure script. |
1 |
dnl Process this file with autoconf to produce a configure script. |
2 |
|
2 |
|
3 |
AC_INIT(OpenEXR, 2.2.1) |
3 |
AC_INIT(OpenEXR, 2.2.1) |
|
|
4 |
AC_CONFIG_MACRO_DIR([m4]) |
4 |
|
5 |
|
5 |
AC_SUBST(OPENEXR_VERSION_MAJOR, 2) |
6 |
AC_SUBST(OPENEXR_VERSION_MAJOR, 2) |
6 |
AC_SUBST(OPENEXR_VERSION_MINOR, 2) |
7 |
AC_SUBST(OPENEXR_VERSION_MINOR, 2) |
Lines 11-19
Link Here
|
11 |
|
12 |
|
12 |
AC_CANONICAL_HOST |
13 |
AC_CANONICAL_HOST |
13 |
AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) |
14 |
AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) |
14 |
AC_CONFIG_HEADER(config/OpenEXRConfig.h) |
15 |
AC_CONFIG_HEADERS([config/OpenEXRConfig.h]) |
15 |
AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better |
16 |
AM_INIT_AUTOMAKE |
16 |
AM_MAINTAINER_MODE |
|
|
17 |
|
17 |
|
18 |
|
18 |
|
19 |
LIBTOOL_CURRENT=22 |
19 |
LIBTOOL_CURRENT=22 |
Lines 27-72
Link Here
|
27 |
AC_PROG_INSTALL |
27 |
AC_PROG_INSTALL |
28 |
AC_PROG_CC |
28 |
AC_PROG_CC |
29 |
AC_PROG_LN_S |
29 |
AC_PROG_LN_S |
30 |
AC_PROG_LIBTOOL |
30 |
LT_INIT |
31 |
AC_PROG_MAKE_SET |
31 |
AC_PROG_MAKE_SET |
32 |
|
32 |
|
33 |
dnl |
33 |
dnl |
34 |
dnl PKGCONFIG preparations |
34 |
dnl PKGCONFIG preparations |
35 |
dnl |
35 |
dnl |
36 |
|
36 |
PKG_CHECK_MODULES([ILMBASE], [IlmBase]) |
37 |
if test -z "${PKG_CONFIG_PATH}"; then |
|
|
38 |
PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig |
39 |
fi |
40 |
|
41 |
LIB64_IF_EXISTS="" |
42 |
if [[ -e /usr/lib64 ]]; then |
43 |
LIB64_IF_EXISTS="-L/usr/lib64" |
44 |
fi |
45 |
|
46 |
|
47 |
|
48 |
export PKG_CONFIG_PATH |
49 |
|
50 |
dnl |
51 |
dnl get ccflags and libs from openexr packages, then check |
52 |
dnl whether test programs compile |
53 |
AM_PATH_PKGCONFIG( |
54 |
[ILMBASE_CXXFLAGS], |
55 |
[ILMBASE_LDFLAGS], |
56 |
[ILMBASE_LIBS], |
57 |
[IlmBase], |
58 |
[OpenEXR], |
59 |
[$LIB64_IF_EXISTS -L/usr/local/lib], |
60 |
[-lImath -lHalf -lIex -lIlmThread -lpthread], |
61 |
[ilmbase-prefix]) |
62 |
|
37 |
|
63 |
|
38 |
|
64 |
dnl Define the version string |
39 |
dnl Define the version string |
65 |
AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}") |
40 |
AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string]) |
66 |
AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}") |
41 |
AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string]) |
67 |
AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR}) |
42 |
AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string]) |
68 |
AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR}) |
43 |
AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string]) |
69 |
AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH}) |
44 |
AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string]) |
70 |
|
45 |
|
71 |
|
46 |
|
72 |
dnl --enable-threading |
47 |
dnl --enable-threading |
Lines 75-93
Link Here
|
75 |
[enable multi-threading [[default=yes]]]), |
50 |
[enable multi-threading [[default=yes]]]), |
76 |
[multithread="${enableval}"], [multithread=yes]) |
51 |
[multithread="${enableval}"], [multithread=yes]) |
77 |
|
52 |
|
78 |
if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then |
53 |
AS_IF([test "x${multithread}" != xno], [ |
79 |
ACX_PTHREAD( |
54 |
AX_PTHREAD |
80 |
[ |
55 |
|
81 |
AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD) |
56 |
AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available]) |
82 |
ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS" |
57 |
|
83 |
ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS" |
58 |
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" |
84 |
CC="$PTHREAD_CC" |
59 |
CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" |
85 |
|
60 |
LIBS="${LIBS} ${PTHREAD_CFLAGS}" |
86 |
AM_POSIX_SEM() |
61 |
]) |
87 |
], |
62 |
|
88 |
[AC_MSG_ERROR([POSIX thread support required])]) |
|
|
89 |
AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS]) |
90 |
fi |
91 |
|
63 |
|
92 |
dnl --enable-large-stack |
64 |
dnl --enable-large-stack |
93 |
case "$host" in |
65 |
case "$host" in |
Lines 110-130
Link Here
|
110 |
esac |
82 |
esac |
111 |
|
83 |
|
112 |
if test "x${large_stack}" != xno ; then |
84 |
if test "x${large_stack}" != xno ; then |
113 |
AC_DEFINE(OPENEXR_IMF_HAVE_LARGE_STACK) |
85 |
AC_DEFINE([OPENEXR_IMF_HAVE_LARGE_STACK], [1], [Define if large stack sizes are supported]) |
114 |
fi |
86 |
fi |
115 |
|
87 |
|
116 |
AM_COMPILELINKRUN( |
88 |
|
117 |
[IlmBase], |
89 |
|
118 |
[ilmbasetest], |
90 |
save_CXXFLAGS="${CXXFLAGS}" |
119 |
[$ILMBASE_CXXFLAGS], |
91 |
save_LIBS="${LIBS}" |
120 |
[$ILMBASE_LDFLAGS], |
92 |
CXXFLAGS="${save_CXXFLAGS} ${ILMBASE_CFLAGS}" |
121 |
[$ILMBASE_LIBS],[[ |
93 |
LIBS="${save_LIBS} ${ILMBASE_LIBS}" |
122 |
#include <stdlib.h> |
94 |
AC_LINK_IFELSE([ |
123 |
#include <ImathFun.h> |
95 |
AC_LANG_PROGRAM([[ |
124 |
]], |
96 |
#include <stdlib.h> |
125 |
[[double d = IMATH_NAMESPACE::succd(.23); d+= .2;]], |
97 |
#include <ImathFun.h> |
126 |
AC_MSG_RESULT([Compiled and ran IlmBase test program.]), |
98 |
]], [[ |
127 |
AC_MSG_ERROR([Could not compile IlmBase test program.])) |
99 |
double d = IMATH_NAMESPACE::succd(.23); d+= .2; |
|
|
100 |
]]) |
101 |
]) |
102 |
CXXFLAGS="${save_CXXFLAGS}" |
103 |
LIBS="${save_LIBS}" |
128 |
|
104 |
|
129 |
|
105 |
|
130 |
dnl Checks for header files. |
106 |
dnl Checks for header files. |
Lines 137-210
Link Here
|
137 |
AC_TYPE_SIZE_T |
113 |
AC_TYPE_SIZE_T |
138 |
|
114 |
|
139 |
dnl Checks for zlib |
115 |
dnl Checks for zlib |
140 |
AC_CHECK_LIB(z, compress, |
116 |
PKG_CHECK_MODULES([ZLIB], [zlib]) |
141 |
[:], |
117 |
|
142 |
[AC_MSG_ERROR([ |
118 |
|
143 |
*** OpenEXR requires a recent version of zlib, which you don't appear to |
119 |
dnl We use a modern toolchain, don't care |
144 |
*** have. |
120 |
dnl about ancient broken stuff |
145 |
*** |
121 |
AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available]) |
146 |
*** This could be because the run-time linker is not finding zlib, or it |
|
|
147 |
*** is finding the wrong version. In this case, you'll need to set your |
148 |
*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point |
149 |
*** to the proper version. Also, make sure you have run ldconfig if |
150 |
*** that is required on your system. |
151 |
])] |
152 |
) |
153 |
|
122 |
|
154 |
dnl Checks for std::right etc. in iomanip |
|
|
155 |
AC_MSG_CHECKING(for complete iomanip support in C++ standard library) |
156 |
complete_iomanip="no" |
157 |
AC_LANG_SAVE |
158 |
AC_LANG_CPLUSPLUS |
159 |
AC_TRY_COMPILE([#include <iomanip>],[ |
160 |
|
161 |
std::right; |
162 |
], |
163 |
AC_DEFINE(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP) complete_iomanip=yes) |
164 |
AC_MSG_RESULT($complete_iomanip) |
165 |
AC_LANG_RESTORE |
166 |
|
167 |
|
168 |
AC_MSG_CHECKING(for gcc optimization flags) |
169 |
old_cflags=$CFLAGS |
170 |
CFLAGS="$CFLAGS -pipe" |
171 |
AC_TRY_COMPILE([#include <stdio.h>], |
172 |
[ printf ("hello, world"); ], |
173 |
[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) |
174 |
CFLAGS=$old_cflags |
175 |
AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) |
176 |
|
123 |
|
177 |
dnl Check to see if the toolset supports AVX instructions in inline asm |
124 |
dnl Check to see if the toolset supports AVX instructions in inline asm |
178 |
AC_MSG_CHECKING(for AVX instructions in GCC style inline asm) |
125 |
AC_ARG_ENABLE([avx], |
179 |
gcc_inline_asm_avx="no" |
126 |
AS_HELP_STRING([--enable-avx], [Enable avx optimization])) |
180 |
AC_COMPILE_IFELSE( |
127 |
|
181 |
[ |
128 |
AS_IF([test "x$enable_avx" = "xyes"], [ |
182 |
AC_LANG_PROGRAM([], |
129 |
dnl Enable AVX |
183 |
[ |
130 |
gcc_inline_asm_avx="yes" |
184 |
#if defined(__GNUC__) && defined(__SSE2__) |
131 |
AC_DEFINE([OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX], [1], [Define if AVX is available]) |
185 |
int n = 0; |
132 |
], [ |
186 |
int eax = 0; |
133 |
dnl Disable AVX |
187 |
int edx = 0; |
134 |
gcc_inline_asm_avx="no" |
188 |
__asm__( |
135 |
]) |
189 |
"xgetbv \n" |
136 |
|
190 |
"vzeroupper " |
|
|
191 |
: "=a"(eax), "=d"(edx) : "c"(n) : ); |
192 |
#else |
193 |
#error No GCC style inline asm supported for AVX instructions |
194 |
#endif |
195 |
]) |
196 |
], |
197 |
[ |
198 |
gcc_inline_asm_avx="yes" |
199 |
], |
200 |
[ |
201 |
gcc_inline_asm_avx="no" |
202 |
] |
203 |
) |
204 |
AC_MSG_RESULT([$gcc_inline_asm_avx]) |
205 |
if test "x${gcc_inline_asm_avx}" == xyes ; then |
206 |
AC_DEFINE(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX) |
207 |
fi |
208 |
|
137 |
|
209 |
dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count |
138 |
dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count |
210 |
AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)]) |
139 |
AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)]) |
Lines 221-236
Link Here
|
221 |
) |
150 |
) |
222 |
AC_MSG_RESULT([$sysconf_nproc]) |
151 |
AC_MSG_RESULT([$sysconf_nproc]) |
223 |
if test "x${sysconf_nproc}" == xyes ; then |
152 |
if test "x${sysconf_nproc}" == xyes ; then |
224 |
AC_DEFINE(OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN) |
153 |
AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count]) |
225 |
fi |
154 |
fi |
226 |
|
155 |
|
227 |
dnl Platform-specific stuff |
156 |
dnl Platform-specific stuff |
228 |
case "$host" in |
157 |
case "$host" in |
229 |
*linux*) |
158 |
*linux*) |
230 |
AC_DEFINE(OPENEXR_IMF_HAVE_LINUX_PROCFS) |
159 |
AC_DEFINE([OPENEXR_IMF_HAVE_LINUX_PROCFS], [1], [Define if procfs is available]) |
231 |
;; |
160 |
;; |
232 |
*darwin*) |
161 |
*darwin*) |
233 |
AC_DEFINE(OPENEXR_IMF_HAVE_DARWIN) |
162 |
AC_DEFINE([OPENEXR_IMF_HAVE_DARWIN], [1], [Define if on Darwin]) |
234 |
|
163 |
|
235 |
dnl OS X universal binary support, requires --disable-dependency-tracking |
164 |
dnl OS X universal binary support, requires --disable-dependency-tracking |
236 |
AC_ARG_ENABLE(osx-universal-binaries, |
165 |
AC_ARG_ENABLE(osx-universal-binaries, |
Lines 245-263
Link Here
|
245 |
--disable-dependency-tracking --enable-osx-universal-binary |
174 |
--disable-dependency-tracking --enable-osx-universal-binary |
246 |
]) |
175 |
]) |
247 |
fi |
176 |
fi |
248 |
CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" |
177 |
dnl CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" |
249 |
dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" |
178 |
dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" |
250 |
fi |
179 |
fi |
251 |
|
180 |
|
252 |
;; |
181 |
;; |
253 |
esac |
182 |
esac |
254 |
|
183 |
|
255 |
AM_CFLAGS="$EXTRA_OPT_CFLAGS" |
|
|
256 |
AM_CXXFLAGS="$EXTRA_OPT_CFLAGS" |
257 |
|
258 |
AC_SUBST(AM_CFLAGS) |
259 |
AC_SUBST(AM_CXXFLAGS) |
260 |
|
261 |
dnl build imfexamples example program? |
184 |
dnl build imfexamples example program? |
262 |
build_imfexamples="no" |
185 |
build_imfexamples="no" |
263 |
AC_ARG_ENABLE(imfexamples, |
186 |
AC_ARG_ENABLE(imfexamples, |
Lines 286-292
Link Here
|
286 |
AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes) |
209 |
AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes) |
287 |
|
210 |
|
288 |
if test "x${build_imfhugetest}" != xno ; then |
211 |
if test "x${build_imfhugetest}" != xno ; then |
289 |
AC_DEFINE(OPENEXR_IMF_HUGETEST) |
212 |
AC_DEFINE([OPENEXR_IMF_HUGETEST], [1], [Define if IlmImf huge input resilience]) |
290 |
fi |
213 |
fi |
291 |
|
214 |
|
292 |
|
215 |
|
Lines 307-325
Link Here
|
307 |
|
230 |
|
308 |
lib_namespace="Imf" |
231 |
lib_namespace="Imf" |
309 |
if test "x${library_namespace_versioning}" == xyes ; then |
232 |
if test "x${library_namespace_versioning}" == xyes ; then |
310 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf_${OPENEXR_VERSION_API}) |
233 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR]) |
311 |
AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM) |
234 |
AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR]) |
312 |
|
235 |
|
313 |
lib_namespace="Imf_${OPENEXR_VERSION_API}" |
236 |
lib_namespace="Imf_${OPENEXR_VERSION_API}" |
314 |
LIB_SUFFIX="${OPENEXR_VERSION_API}" |
237 |
LIB_SUFFIX="${OPENEXR_VERSION_API}" |
315 |
lib_suffix_valid="yes" |
238 |
lib_suffix_valid="yes" |
316 |
elif test "x${library_namespace_versioning}" == xno ; then |
239 |
elif test "x${library_namespace_versioning}" == xno ; then |
317 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf) |
240 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR]) |
318 |
|
241 |
|
319 |
lib_namespace="Imf" |
242 |
lib_namespace="Imf" |
320 |
else |
243 |
else |
321 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, ${library_namespace_versioning} ) |
244 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [${library_namespace_versioning}], [OpenEXR]) |
322 |
AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM) |
245 |
AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR]) |
323 |
|
246 |
|
324 |
lib_namespace="${library_namespace_versioning}" |
247 |
lib_namespace="${library_namespace_versioning}" |
325 |
LIB_SUFFIX="${library_namespace_versioning}" |
248 |
LIB_SUFFIX="${library_namespace_versioning}" |
Lines 349-362
Link Here
|
349 |
|
272 |
|
350 |
if test "x${custom_usr_namespace}" == xyes ; then |
273 |
if test "x${custom_usr_namespace}" == xyes ; then |
351 |
AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf']) |
274 |
AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf']) |
352 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf) |
275 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) |
353 |
usr_namespace="Imf" |
276 |
usr_namespace="Imf" |
354 |
elif test "x${custom_usr_namespace}" == xno ; then |
277 |
elif test "x${custom_usr_namespace}" == xno ; then |
355 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf) |
278 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) |
356 |
usr_namespace="Imf" |
279 |
usr_namespace="Imf" |
357 |
else |
280 |
else |
358 |
AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, ${custom_usr_namespace}) |
281 |
AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [${custom_usr_namespace}], [OpenEXR]) |
359 |
AC_DEFINE(OPENEXR_IMF_NAMESPACE_CUSTOM) |
282 |
AC_DEFINE([OPENEXR_IMF_NAMESPACE_CUSTOM], [1], [OpenEXR]) |
360 |
|
283 |
|
361 |
usr_namespace=${custom_usr_namespace} |
284 |
usr_namespace=${custom_usr_namespace} |
362 |
fi |
285 |
fi |
363 |
-- a/doc/Makefile.am |
286 |
++ b/doc/Makefile.am |
Lines 6-10
Link Here
|
6 |
InterpretingDeepPixels.pdf \ |
6 |
InterpretingDeepPixels.pdf \ |
7 |
TheoryDeepPixels.pdf |
7 |
TheoryDeepPixels.pdf |
8 |
|
8 |
|
9 |
docdir=$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@ |
|
|
10 |
doc_DATA = $(EXTRA_DIST) |
9 |
doc_DATA = $(EXTRA_DIST) |
11 |
-- a/exrenvmap/Makefile.am |
10 |
++ b/exrenvmap/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \ |
13 |
exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \ |
14 |
readInputImage.cpp readInputImage.h \ |
14 |
readInputImage.cpp readInputImage.h \ |
15 |
-- a/exrheader/Makefile.am |
15 |
++ b/exrheader/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrheader_SOURCES = main.cpp |
13 |
exrheader_SOURCES = main.cpp |
14 |
|
14 |
|
15 |
-- a/exrmakepreview/Makefile.am |
15 |
++ b/exrmakepreview/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h |
13 |
exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h |
14 |
|
14 |
|
15 |
-- a/exrmaketiled/Makefile.am |
15 |
++ b/exrmaketiled/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrmaketiled_SOURCES = main.cpp \ |
13 |
exrmaketiled_SOURCES = main.cpp \ |
14 |
Image.h Image.cpp \ |
14 |
Image.h Image.cpp \ |
15 |
-- a/exrmultipart/Makefile.am |
15 |
++ b/exrmultipart/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrmultipart_SOURCES = exrmultipart.cpp |
13 |
exrmultipart_SOURCES = exrmultipart.cpp |
14 |
|
14 |
|
15 |
-- a/exrmultiview/Makefile.am |
15 |
++ b/exrmultiview/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrmultiview_SOURCES = main.cpp \ |
13 |
exrmultiview_SOURCES = main.cpp \ |
14 |
Image.h Image.cpp \ |
14 |
Image.h Image.cpp \ |
15 |
-- a/exrstdattr/Makefile.am |
15 |
++ b/exrstdattr/Makefile.am |
Lines 4-14
Link Here
|
4 |
|
4 |
|
5 |
INCLUDES = -I$(top_builddir) \ |
5 |
INCLUDES = -I$(top_builddir) \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
6 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
7 |
@ILMBASE_CXXFLAGS@ |
7 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
8 |
|
8 |
|
9 |
LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
9 |
LDADD = $(ILMBASE_LIBS) \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
10 |
$(top_builddir)/IlmImf/libIlmImf.la \ |
11 |
-lz |
11 |
$(ZLIB_LIBS) |
12 |
|
12 |
|
13 |
exrstdattr_SOURCES = main.cpp CMakeLists.txt |
13 |
exrstdattr_SOURCES = main.cpp CMakeLists.txt |
14 |
|
14 |
|
15 |
-- a/IlmImf/Makefile.am |
15 |
++ b/IlmImf/Makefile.am |
Lines 93-99
Link Here
|
93 |
ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp |
93 |
ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp |
94 |
|
94 |
|
95 |
|
95 |
|
96 |
libIlmImf_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \ |
96 |
libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \ |
97 |
-no-undefined |
97 |
-no-undefined |
98 |
|
98 |
|
99 |
|
99 |
|
Lines 102-108
Link Here
|
102 |
endif |
102 |
endif |
103 |
|
103 |
|
104 |
|
104 |
|
105 |
libIlmImf_la_LIBADD = -lz @ILMBASE_LIBS@ |
105 |
libIlmImf_la_LIBADD = $(ZLIB_LIBS) $(ILMBASE_LIBS) |
106 |
|
106 |
|
107 |
libIlmImfincludedir = $(includedir)/OpenEXR |
107 |
libIlmImfincludedir = $(includedir)/OpenEXR |
108 |
|
108 |
|
Lines 188-207
Link Here
|
188 |
EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt |
188 |
EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt |
189 |
|
189 |
|
190 |
|
190 |
|
191 |
INCLUDES = @ILMBASE_CXXFLAGS@ \ |
191 |
INCLUDES = \ |
192 |
-I$(top_builddir) \ |
192 |
-I$(top_builddir) \ |
193 |
-I$(top_srcdir)/config |
193 |
-I$(top_srcdir)/config \ |
|
|
194 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
194 |
|
195 |
|
195 |
CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h |
196 |
CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h |
196 |
|
197 |
|
197 |
b44ExpLogTable_SOURCES = b44ExpLogTable.cpp |
198 |
b44ExpLogTable_SOURCES = b44ExpLogTable.cpp |
198 |
b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ |
199 |
b44ExpLogTable_LDADD = $(ILMBASE_LIBS) |
199 |
|
200 |
|
200 |
b44ExpLogTable.h: b44ExpLogTable |
201 |
b44ExpLogTable.h: b44ExpLogTable |
201 |
./b44ExpLogTable > b44ExpLogTable.h |
202 |
./b44ExpLogTable > b44ExpLogTable.h |
202 |
|
203 |
|
203 |
dwaLookups_SOURCES = dwaLookups.cpp |
204 |
dwaLookups_SOURCES = dwaLookups.cpp |
204 |
dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ |
205 |
dwaLookups_LDADD = $(ILMBASE_LIBS) |
205 |
|
206 |
|
206 |
dwaLookups.h: dwaLookups |
207 |
dwaLookups.h: dwaLookups |
207 |
./dwaLookups > dwaLookups.h |
208 |
./dwaLookups > dwaLookups.h |
208 |
-- a/IlmImfExamples/Makefile.am |
209 |
++ b/IlmImfExamples/Makefile.am |
Lines 6-16
Link Here
|
6 |
|
6 |
|
7 |
INCLUDES = -I$(top_builddir) \ |
7 |
INCLUDES = -I$(top_builddir) \ |
8 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
8 |
-I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \ |
9 |
@ILMBASE_CXXFLAGS@ |
9 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
10 |
|
10 |
|
11 |
LDADD = -L$(top_builddir)/IlmImf \ |
11 |
LDADD = -L$(top_builddir)/IlmImf \ |
12 |
@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
12 |
$(ILMBASE_LIBS) \ |
13 |
-lIlmImf -lz |
13 |
-lIlmImf $(ZLIB_CFLAGS) |
14 |
|
14 |
|
15 |
imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \ |
15 |
imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \ |
16 |
rgbaInterfaceTiledExamples.cpp \ |
16 |
rgbaInterfaceTiledExamples.cpp \ |
Lines 23-29
Link Here
|
23 |
lowLevelIoExamples.h previewImageExamples.h \ |
23 |
lowLevelIoExamples.h previewImageExamples.h \ |
24 |
namespaceAlias.h |
24 |
namespaceAlias.h |
25 |
|
25 |
|
26 |
examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples |
26 |
examplesdir = $(docdir)/examples |
27 |
examples_DATA = $(imfexamples_SOURCES) |
27 |
examples_DATA = $(imfexamples_SOURCES) |
28 |
|
28 |
|
29 |
imfexamplesdir = $(examplesdir) |
29 |
imfexamplesdir = $(examplesdir) |
30 |
-- a/IlmImfFuzzTest/Makefile.am |
30 |
++ b/IlmImfFuzzTest/Makefile.am |
Lines 14-24
Link Here
|
14 |
INCLUDES = -I$(top_builddir) \ |
14 |
INCLUDES = -I$(top_builddir) \ |
15 |
-I$(top_srcdir)/IlmImf \ |
15 |
-I$(top_srcdir)/IlmImf \ |
16 |
-I$(top_srcdir)/config \ |
16 |
-I$(top_srcdir)/config \ |
17 |
@ILMBASE_CXXFLAGS@ |
17 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
18 |
|
18 |
|
19 |
LDADD = -L$(top_builddir)/IlmImf \ |
19 |
LDADD = -L$(top_builddir)/IlmImf \ |
20 |
@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
20 |
$(ILMBASE_LIBS) \ |
21 |
-lIlmImf -lz |
21 |
-lIlmImf $(ZLIB_LIBS) |
22 |
|
22 |
|
23 |
if BUILD_IMFFUZZTEST |
23 |
if BUILD_IMFFUZZTEST |
24 |
TESTS = IlmImfFuzzTest |
24 |
TESTS = IlmImfFuzzTest |
25 |
-- a/IlmImfTest/Makefile.am |
25 |
++ b/IlmImfTest/Makefile.am |
Lines 62-72
Link Here
|
62 |
INCLUDES = -I$(top_builddir) \ |
62 |
INCLUDES = -I$(top_builddir) \ |
63 |
-I$(top_srcdir)/IlmImf \ |
63 |
-I$(top_srcdir)/IlmImf \ |
64 |
-I$(top_srcdir)/config \ |
64 |
-I$(top_srcdir)/config \ |
65 |
@ILMBASE_CXXFLAGS@ |
65 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
66 |
|
66 |
|
67 |
LDADD = -L$(top_builddir)/IlmImf \ |
67 |
LDADD = -L$(top_builddir)/IlmImf \ |
68 |
@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
68 |
$(ILMBASE_LIBS) \ |
69 |
-lIlmImf -lz |
69 |
-lIlmImf $(ZLIB_LIBS) |
70 |
|
70 |
|
71 |
TESTS = IlmImfTest |
71 |
TESTS = IlmImfTest |
72 |
|
72 |
|
73 |
-- a/IlmImfUtil/Makefile.am |
73 |
++ b/IlmImfUtil/Makefile.am |
Lines 20-26
Link Here
|
20 |
ImfImageChannelRenaming.h |
20 |
ImfImageChannelRenaming.h |
21 |
|
21 |
|
22 |
|
22 |
|
23 |
libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \ |
23 |
libIlmImfUtil_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \ |
24 |
-no-undefined |
24 |
-no-undefined |
25 |
|
25 |
|
26 |
|
26 |
|
Lines 29-42
Link Here
|
29 |
endif |
29 |
endif |
30 |
|
30 |
|
31 |
|
31 |
|
32 |
libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf |
32 |
libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf |
33 |
|
33 |
|
34 |
libIlmImfUtilincludedir = $(includedir)/OpenEXR |
34 |
libIlmImfUtilincludedir = $(includedir)/OpenEXR |
35 |
|
35 |
|
36 |
EXTRA_DIST = CMakeLists.txt |
36 |
EXTRA_DIST = CMakeLists.txt |
37 |
|
37 |
|
38 |
INCLUDES = @ILMBASE_CXXFLAGS@ \ |
38 |
INCLUDES = \ |
39 |
-I$(top_builddir) \ |
39 |
-I$(top_builddir) \ |
40 |
-I$(top_srcdir)/IlmImf \ |
40 |
-I$(top_srcdir)/IlmImf \ |
41 |
-I$(top_srcdir)/config |
41 |
-I$(top_srcdir)/config \ |
|
|
42 |
$(ILMBASE_CFLAGS) |
42 |
|
43 |
|
43 |
-- a/IlmImfUtilTest/Makefile.am |
44 |
++ b/IlmImfUtilTest/Makefile.am |
Lines 11-22
Link Here
|
11 |
-I$(top_srcdir)/IlmImf \ |
11 |
-I$(top_srcdir)/IlmImf \ |
12 |
-I$(top_srcdir)/IlmImfUtil \ |
12 |
-I$(top_srcdir)/IlmImfUtil \ |
13 |
-I$(top_srcdir)/config \ |
13 |
-I$(top_srcdir)/config \ |
14 |
@ILMBASE_CXXFLAGS@ |
14 |
$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS) |
15 |
|
15 |
|
16 |
LDADD = -L$(top_builddir)/IlmImf \ |
16 |
LDADD = -L$(top_builddir)/IlmImf \ |
17 |
-L$(top_builddir)/IlmImfUtil \ |
17 |
-L$(top_builddir)/IlmImfUtil \ |
18 |
@ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \ |
18 |
$(ILMBASE_LIBS) \ |
19 |
-lIlmImfUtil -lIlmImf -lz |
19 |
-lIlmImfUtil -lIlmImf $(ZLIB_LIBS) |
20 |
|
20 |
|
21 |
TESTS = IlmImfUtilTest |
21 |
TESTS = IlmImfUtilTest |
22 |
|
22 |
|