Commit 1df0314e authored by John Koleszar's avatar John Koleszar

configure: remove HAVE_CONFIG_H

This doesn't play well with autotools, and the preprocessor magic is
confusing and unhelpful in the vp8-only context.

Change-Id: I2fcb57e6eb7876ecb58509da608dc21f26077ff1
parent 6e12cc94
......@@ -8,5 +8,5 @@ REM file in the root of the source tree.
echo on
cl /I ".\\" /I "..\vp6_decoder_sdk" /I "..\vp6_decoder_sdk\vpx_ports" /D "NDEBUG" /D "_WIN32_WCE=0x420" /D "UNDER_CE" /D "WIN32_PLATFORM_PSPC" /D "WINCE" /D "_LIB" /D "ARM" /D "_ARM_" /D "_UNICODE" /D "UNICODE" /D "HAVE_CONFIG_H" /FD /EHsc /MT /GS- /fp:fast /GR- /Fo"Pocket_PC_2003__ARMV4_\%1/" /Fd"Pocket_PC_2003__ARMV4_\%1/vc80.pdb" /W3 /nologo /c /TC ..\vp6_decoder_sdk\vp6_decoder\algo\common\arm\dec_asm_offsets_arm.c
cl /I ".\\" /I "..\vp6_decoder_sdk" /I "..\vp6_decoder_sdk\vpx_ports" /D "NDEBUG" /D "_WIN32_WCE=0x420" /D "UNDER_CE" /D "WIN32_PLATFORM_PSPC" /D "WINCE" /D "_LIB" /D "ARM" /D "_ARM_" /D "_UNICODE" /D "UNICODE" /FD /EHsc /MT /GS- /fp:fast /GR- /Fo"Pocket_PC_2003__ARMV4_\%1/" /Fd"Pocket_PC_2003__ARMV4_\%1/vc80.pdb" /W3 /nologo /c /TC ..\vp6_decoder_sdk\vp6_decoder\algo\common\arm\dec_asm_offsets_arm.c
obj_int_extract.exe rvds "Pocket_PC_2003__ARMV4_\%1/dec_asm_offsets_arm.obj"
......@@ -348,7 +348,6 @@ true
}
write_common_target_config_mk() {
[ -n "$2" ] && local have_config_h="-DHAVE_CONFIG_H=\"${2##*/}\""
local CC=${CC}
enabled ccache && CC="ccache ${CC}"
......@@ -367,7 +366,7 @@ AS=${AS}
STRIP=${STRIP}
NM=${NM}
CFLAGS = ${CFLAGS} ${have_config_h}
CFLAGS = ${CFLAGS}
ARFLAGS = -rus\$(if \$(quiet),c,v)
LDFLAGS = ${LDFLAGS}
ASFLAGS = ${ASFLAGS}
......
......@@ -385,7 +385,7 @@ generate_vcproj() {
ExecutionBucket="7" \
Optimization="0" \
AdditionalIncludeDirectories="$incs" \
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;HAVE_CONFIG_H" \
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \
MinimalRebuild="true" \
RuntimeLibrary="1" \
BufferSecurityCheck="false" \
......@@ -404,7 +404,7 @@ generate_vcproj() {
ExecutionBucket="7" \
Optimization="0" \
AdditionalIncludeDirectories="$incs" \
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;HAVE_CONFIG_H" \
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;DEBUG;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \
MinimalRebuild="true" \
RuntimeLibrary="1" \
BufferSecurityCheck="false" \
......@@ -544,7 +544,7 @@ generate_vcproj() {
Optimization="2" \
FavorSizeOrSpeed="1" \
AdditionalIncludeDirectories="$incs" \
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;HAVE_CONFIG_H" \
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_LIB;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \
RuntimeLibrary="0" \
BufferSecurityCheck="false" \
UsePrecompiledHeader="0" \
......@@ -563,7 +563,7 @@ generate_vcproj() {
Optimization="2" \
FavorSizeOrSpeed="1" \
AdditionalIncludeDirectories="$incs" \
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;HAVE_CONFIG_H" \
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=\$(CEVER);UNDER_CE;\$(PLATFORMDEFINES);WINCE;_CONSOLE;\$(ARCHFAM);\$(_ARCHFAM_);_UNICODE;UNICODE;" \
RuntimeLibrary="0" \
BufferSecurityCheck="false" \
UsePrecompiledHeader="0" \
......
......@@ -17,10 +17,8 @@
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_decoder.h"
#if CONFIG_VP8_DECODER && !defined(interface)
#include "vp8dx.h"
#define interface (&vpx_codec_vp8_dx_algo)
#endif
@EXTRA_INCLUDES
......
......@@ -17,11 +17,9 @@
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_encoder.h"
#if CONFIG_VP8_ENCODER && !defined(interface)
#include "vp8cx.h"
#define interface (&vpx_codec_vp8_cx_algo)
#define fourcc 0x30385056
#endif
@EXTRA_INCLUDES
#define IVF_FILE_HDR_SZ (32)
......
......@@ -11,7 +11,11 @@
/* This is a simple program that encodes YV12 files and generates ivf
* files using the new interface.
*/
#define USE_POSIX_MMAP HAVE_SYS_MMAN_H
#if defined(_MSC_VER)
#define USE_POSIX_MMAP 0
#else
#define USE_POSIX_MMAP 1
#endif
#include <stdio.h>
#include <stdlib.h>
......@@ -25,9 +29,7 @@
#include <fcntl.h>
#include <unistd.h>
#endif
#if CONFIG_VP8_ENCODER
#include "vp8cx.h"
#endif
#include "vpx_ports/mem_ops.h"
#include "vpx_ports/vpx_timer.h"
......
......@@ -20,8 +20,10 @@ include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk
CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS))
# Add vpx_codec/ to the include path to allow vp_n[cd]x.h to reference
# vpx_codec_impl_*.h without extra ifdeffery
# vpx_codec_impl_*.h without extra ifdeffery. vpx_ports to pick up
# vpx_integer.h
CFLAGS += -I$(SRC_PATH_BARE)/vpx_codec
CFLAGS += -I$(SRC_PATH_BARE)/vpx_ports
ifeq ($(CONFIG_VP8_ENCODER),yes)
VP8_PREFIX=vp8/
......
......@@ -8,6 +8,7 @@
*/
#include "vpx_ports/config.h"
#include "blockd.h"
#include "vpx_mem/vpx_mem.h"
#include "onyxc_int.h"
......@@ -16,9 +17,6 @@
#include "systemdependent.h"
#include "vpxerrors.h"
#ifdef HAVE_CONFIG_H
#include "vpx_config.h"
#endif
extern void vp8_init_scan_order_mask();
......
......@@ -14,6 +14,7 @@
*/
#include <stdlib.h>
#include <string.h>
#include "vpx_ports/vpx_integer.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx_version.h"
......
......@@ -41,14 +41,7 @@ extern "C" {
#ifndef VPX_CODEC_H
#define VPX_CODEC_H
#ifdef HAVE_CONFIG_H
# include "vpx_config.h"
#endif
#if defined(HAVE_VPX_PORTS) && HAVE_VPX_PORTS
# include "vpx_ports/vpx_integer.h"
#else
# include "vpx_integer.h"
#endif
#include "vpx_integer.h"
#include "vpx_image.h"
/*!\brief Decorator indicating a function is deprecated */
......
......@@ -6,14 +6,4 @@
* tree. All contributing project authors may be found in the AUTHORS
* file in the root of the source tree.
*/
/* This file uses some preprocessor magic to expand the value of HAVE_CONFIG_H,
* as defined by the build system, so that different projects can use the file
* name for config.h that suits them.
*/
#define QUOTE_(x) #x
#define QUOTE(x) QUOTE_(x)
#include QUOTE(HAVE_CONFIG_H)
#undef QUOTE
#undef QUOTE_
#include "vpx_config.h"
......@@ -14,13 +14,7 @@
/* get ptrdiff_t, size_t, wchar_t, NULL */
#include <stddef.h>
#if defined(HAVE_STDINT_H) && HAVE_STDINT_H
#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
#define __STDC_FORMAT_MACROS
#endif
#include <stdint.h>
#include <inttypes.h>
#else
#if defined(_MSC_VER) || defined(VPX_EMULATE_INTTYPES)
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed int int32_t;
......@@ -47,6 +41,16 @@ typedef unsigned char uint_fast8_t;
typedef unsigned int uintptr_t;
#endif
#else
/* Most platforms have the C99 standard integer types. */
#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
#define __STDC_FORMAT_MACROS
#endif
#include <stdint.h>
#include <inttypes.h>
#endif
#endif
......@@ -11,9 +11,7 @@
#ifndef __VPXTYPES_H__
#define __VPXTYPES_H__
#ifdef HAVE_CONFIG_H
#include HAVE_CONFIG_H
#endif
#include "vpx_ports/config.h"
//#include <sys/types.h>
#ifdef _MSC_VER
......
......@@ -8,11 +8,9 @@
*/
#include "vpx_ports/config.h"
#include "vpx_scale/vpxscale.h"
#ifdef HAVE_CONFIG_H
#include "vpx_config.h"
#endif
void (*vp8_yv12_extend_frame_borders_ptr)(YV12_BUFFER_CONFIG *ybf);
extern void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
......
......@@ -8,11 +8,9 @@
*/
#include "vpx_ports/config.h"
#include "vpx_scale/vpxscale.h"
#ifdef HAVE_CONFIG_H
#include "vpx_config.h"
#endif
void (*vp8_yv12_extend_frame_borders_ptr)(YV12_BUFFER_CONFIG *ybf);
extern void vp8_yv12_extend_frame_borders(YV12_BUFFER_CONFIG *ybf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment