Mercurial > octave-nkf

comparison src/Makefile.in @ 7914:e998e81224b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various compilation fixes for MSVC.
author John W. Eaton <jwe@octave.org>
date Thu, 10 Jul 2008 08:59:18 -0400
parents bcacdcc726f7
children d74f996e005d
comparison
equal deleted inserted replaced
7913:f46e73bcb85b 7914:e998e81224b5
276 $(GLPK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ 276 $(GLPK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
277 $(LIBPLPLOT) $(LIBGLOB) 277 $(LIBPLPLOT) $(LIBGLOB)
278 endif 278 endif
279 279
280 OCTINTERP_LINK_DEPS = \ 280 OCTINTERP_LINK_DEPS = \
281 -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) 281 -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) \
282 $(OPENGL_LIBS)
282 283
283 OCT_LINK_DEPS = \ 284 OCT_LINK_DEPS = \
284 -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ 285 -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \
285 -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ 286 -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \
286 $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ 287 $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
303 lex.o parse.o pic/lex.o pic/parse.o: \ 304 lex.o parse.o pic/lex.o pic/parse.o: \
304 ALL_CXXFLAGS := $(filter-out -Wold-style-cast, $(ALL_CXXFLAGS)) 305 ALL_CXXFLAGS := $(filter-out -Wold-style-cast, $(ALL_CXXFLAGS))
305 306
306 $(DLD_PICOBJ): \ 307 $(DLD_PICOBJ): \
307 ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS)) 308 ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS))
309
310 fltk_backend.o pic/fltk_backend.o: \
311 ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS) $(GRAPHICS_CFLAGS))
308 312
309 XERBLA = ../libcruft/blas-xtra/xerbla.o 313 XERBLA = ../libcruft/blas-xtra/xerbla.o
310 ifdef FPICFLAG 314 ifdef FPICFLAG
311 PIC_XERBLA = ../libcruft/blas-xtra/pic/xerbla.o 315 PIC_XERBLA = ../libcruft/blas-xtra/pic/xerbla.o
312 else 316 else