Changeset 4836 for branches/r9


Ignore:
Timestamp:
Dec 11, 2014, 11:07:59 AM (10 years ago)
Author:
gah
Message:
 
Location:
branches/r9/src
Files:
11 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/r9/src/core/Makefile.in

    r4118 r4836  
    2525STLIB_LD        = @STLIB_LD@
    2626SHLIB_LD        = @SHLIB_LD@
    27 SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    28 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     27SHLIB_CFLAGS    = @SHLIB_CFLAGS@ 
     28SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2929SHLIB_SUFFIX    = @SHLIB_SUFFIX@
     30LIB_RUNTIME_DIR  = $(libdir)
    3031CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    3132LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    3233CFLAGS          = @CFLAGS@ -fPIC
    33 DX_LIB_SPEC     = @DX_LIB_SPEC@
    34 DX_INC_SPEC     = @DX_INC_SPEC@
    3534DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
    3635                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
    … …  
    178177
    179178install_libs: $(lib)  $(shared_lib)
     179        $(MKDIR_P) -m 755 $(libdir)
    180180        $(INSTALL) -m 444 $(lib) $(libdir)
    181181        $(INSTALL) -m 555 $(shared_lib) $(libdir)

  • branches/r9/src/core/config.h.in

    r4146 r4836  
    1 /* src/core/config.h.in.  Generated from configure.in by autoheader.  */
     1/* core/config.h.in.  Generated from configure.in by autoheader.  */
    22
    33/* Define if building universal (internal helper macro) */
    44#undef AC_APPLE_UNIVERSAL_BUILD
    5 
    6 /* Build rappture with ffmpeg widgets */
    7 #undef BUILD_with_ffmpeg
    85
    96/* Define to 1 if you have the <algorithm> header file. */
    … …  
    129/* Define to 1 if you have the <assert.h> header file. */
    1310#undef HAVE_ASSERT_H
    14 
    15 /* Define to 1 if you have the `avcodec_decode_video' function. */
    16 #undef HAVE_AVCODEC_DECODE_VIDEO
    17 
    18 /* Define to 1 if you have the `avcodec_decode_video2' function. */
    19 #undef HAVE_AVCODEC_DECODE_VIDEO2
    20 
    21 /* Define to 1 if you have the `avcodec_open' function. */
    22 #undef HAVE_AVCODEC_OPEN
    23 
    24 /* Define to 1 if you have the `avcodec_open2' function. */
    25 #undef HAVE_AVCODEC_OPEN2
    26 
    27 /* Define to 1 if you have the `avformat_close_input' function. */
    28 #undef HAVE_AVFORMAT_CLOSE_INPUT
    29 
    30 /* Define to 1 if you have the `avformat_find_stream_info' function. */
    31 #undef HAVE_AVFORMAT_FIND_STREAM_INFO
    32 
    33 /* Define to 1 if you have the `avformat_open_input' function. */
    34 #undef HAVE_AVFORMAT_OPEN_INPUT
    35 
    36 /* Define to 1 if you have the `avio_close' function. */
    37 #undef HAVE_AVIO_CLOSE
    38 
    39 /* Define if AVMEDIA_TYPE_VIDEO enum exists. */
    40 #undef HAVE_AVMEDIA_TYPE_VIDEO
    41 
    42 /* Define to 1 if you have the `av_close_input_file' function. */
    43 #undef HAVE_AV_CLOSE_INPUT_FILE
    44 
    45 /* Define to 1 if you have the `av_find_stream_info' function. */
    46 #undef HAVE_AV_FIND_STREAM_INFO
    47 
    48 /* Define to 1 if you have the `av_open_input_file' function. */
    49 #undef HAVE_AV_OPEN_INPUT_FILE
    5011
    5112/* Define to 1 if you have the <cctype> header file. */
    … …  
    7031#undef HAVE_CTYPE_H
    7132
    72 /* Define to 1 if you have the <env.h> header file. */
    73 #undef HAVE_ENV_H
    74 
    7533/* Define to 1 if you have the <errno.h> header file. */
    7634#undef HAVE_ERRNO_H
    77 
    78 /* Render servers can use ffmpeg */
    79 #undef HAVE_FFMPEG
    80 
    81 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
    82 #undef HAVE_FFMPEG_AVCODEC_H
    83 
    84 /* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
    85 #undef HAVE_FFMPEG_AVFORMAT_H
    86 
    87 /* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
    88 #undef HAVE_FFMPEG_AVUTIL_H
    89 
    90 /* Define to 1 if you have the <ffmpeg/swscale.h> header file. */
    91 #undef HAVE_FFMPEG_SWSCALE_H
    9235
    9336/* Define to 1 if you have the <float.h> header file. */
    … …  
    10043#undef HAVE_GETTIMEOFDAY
    10144
    102 /* Define to 1 if you have the `img_convert' function. */
    103 #undef HAVE_IMG_CONVERT
    104 
    10545/* Define to 1 if you have the <inttypes.h> header file. */
    10646#undef HAVE_INTTYPES_H
    … …  
    11252#undef HAVE_ITERATOR
    11353
    114 /* Define to 1 if you have the `avcodec' library (-lavcodec). */
    115 #undef HAVE_LIBAVCODEC
    116 
    117 /* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
    118 #undef HAVE_LIBAVCODEC_AVCODEC_H
    119 
    120 /* Define to 1 if you have the `avformat' library (-lavformat). */
    121 #undef HAVE_LIBAVFORMAT
    122 
    123 /* Define to 1 if you have the <libavformat/avformat.h> header file. */
    124 #undef HAVE_LIBAVFORMAT_AVFORMAT_H
    125 
    126 /* Define to 1 if you have the `avutil' library (-lavutil). */
    127 #undef HAVE_LIBAVUTIL
    128 
    129 /* Define to 1 if you have the <libavutil/avutil.h> header file. */
    130 #undef HAVE_LIBAVUTIL_AVUTIL_H
    131 
    132 /* Define to 1 if you have the <libavutil/mathematics.h> header file. */
    133 #undef HAVE_LIBAVUTIL_MATHEMATICS_H
    134 
    13554/* Define to 1 if you have the `ncurses' library (-lncurses). */
    13655#undef HAVE_LIBNCURSES
    … …  
    13857/* Define to 1 if you have the `stdc++' library (-lstdc++). */
    13958#undef HAVE_LIBSTDC__
    140 
    141 /* Define to 1 if you have the `swscale' library (-lswscale). */
    142 #undef HAVE_LIBSWSCALE
    143 
    144 /* Define to 1 if you have the <libswscale/swscale.h> header file. */
    145 #undef HAVE_LIBSWSCALE_SWSCALE_H
    14659
    14760/* Define to 1 if you have the <limits.h> header file. */
    … …  
    16275/* Define to 1 if you have the <ncurses.h> header file. */
    16376#undef HAVE_NCURSES_H
    164 
    165 /* Define to 1 if you have the <node.h> header file. */
    166 #undef HAVE_NODE_H
    167 
    168 /* Define to 1 if you have the <Python.h> header file. */
    169 #undef HAVE_PYTHON_H
    170 
    171 /* Define to 1 if you have the <ruby.h> header file. */
    172 #undef HAVE_RUBY_H
    173 
    174 /* Define to 1 if you have the <ruby/node.h> header file. */
    175 #undef HAVE_RUBY_NODE_H
    17677
    17778/* Define to 1 if you have the <sstream> header file. */
    … …  
    199100#undef HAVE_STRING_H
    200101
    201 /* Define to 1 if you have the `sws_getCachedContext' function. */
    202 #undef HAVE_SWS_GETCACHEDCONTEXT
    203 
    204 /* Define to 1 if you have the `sws_scale' function. */
    205 #undef HAVE_SWS_SCALE
    206 
    207102/* Define to 1 if you have the `sysinfo' function. */
    208103#undef HAVE_SYSINFO
    … …  
    220115#undef HAVE_UNISTD_H
    221116
    222 /* Define to 1 if you have the `url_close' function. */
    223 #undef HAVE_URL_CLOSE
    224 
    225117/* Define to 1 if you have the <vector> header file. */
    226118#undef HAVE_VECTOR
    227 
    228 /* Define to 1 if you have the <version.h> header file. */
    229 #undef HAVE_VERSION_H
    230119
    231120/* Define to the address where bug reports for this package should be sent. */
    … …  
    241130#undef PACKAGE_TARNAME
    242131
     132/* Define to the home page for this package. */
     133#undef PACKAGE_URL
     134
    243135/* Define to the version of this package. */
    244136#undef PACKAGE_VERSION
    245 
    246 /* Define this macro to use ruby/node.h */
    247 #undef REALLY_HAVE_RUBY_NODE_H
    248137
    249138/* The size of `int', as computed by sizeof. */

  • branches/r9/src/core2/Makefile.in

    r1944 r4836  
    3333SHLIB_LD        = @SHLIB_LD@
    3434SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    35 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     35SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    3636SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    3737CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    3838LIB_SEARCH_DIRS = -L../core @LIB_SEARCH_DIRS@
     39LIB_RUNTIME_DIR  = $(libdir)
    3940CFLAGS          = @CFLAGS@ -fPIC
    4041CPP             = @CPP@

  • branches/r9/src/objects/Makefile.in

    r3471 r4836  
    2222SHLIB_LD        = @SHLIB_LD@
    2323SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    24 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
     24SHLIB_LDFLAGS   = @CC_SEARCH_FLAGS@
    2525SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    2626CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    2727LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
     28LIB_RUNTIME_DIR  = $(libdir)
    2829CFLAGS          = @CFLAGS@ -fPIC
    2930FFMPEG          = @HAVE_FFMPEG_LIBS@

  • branches/r9/src/objects/RpHash.c

    r1270 r4836  
    4141 */
    4242
     43#include "../core/config.h"
    4344#include <RpInt.h>
    4445

  • branches/r9/src/objects/RpHash.h.in

    r1270 r4836  
    5050#ifndef SIZEOF_VOID_P
    5151#define SIZEOF_VOID_P @SIZEOF_VOID_P@
    52 #endif
    53 #ifndef HAVE_INTTYPES_H
    54 #if @HAVE_INTTYPES_H@
    55 #define HAVE_INTTYPES_H 1
    56 #endif
    5752#endif
    5853#endif /* !RP_INT_H */
Note: See TracChangeset for help on using the changeset viewer.