From 1df0314e7b55b96ec56dd47baac68d06deff5491 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Thu, 20 May 2010 14:44:18 -0400 Subject: [PATCH] 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 --- build/arm-wince-vs8/obj_int_extract.bat | 2 +- build/make/configure.sh | 3 +-- build/make/gen_msvs_proj.sh | 8 ++++---- examples/decoder_tmpl.c | 2 -- examples/encoder_tmpl.c | 2 -- ivfenc.c | 8 +++++--- libs.mk | 4 +++- vp8/common/alloccommon.c | 4 +--- vpx_codec/src/vpx_codec.c | 1 + vpx_codec/vpx_codec.h | 9 +-------- vpx_ports/config.h | 12 +----------- vpx_ports/vpx_integer.h | 18 +++++++++++------- vpx_ports/vpxtypes.h | 4 +--- vpx_scale/arm/scalesystemdependant.c | 4 +--- vpx_scale/generic/scalesystemdependant.c | 4 +--- 15 files changed, 32 insertions(+), 53 deletions(-) diff --git a/build/arm-wince-vs8/obj_int_extract.bat b/build/arm-wince-vs8/obj_int_extract.bat index e58bdd60a..9013dbd71 100644 --- a/build/arm-wince-vs8/obj_int_extract.bat +++ b/build/arm-wince-vs8/obj_int_extract.bat @@ -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" diff --git a/build/make/configure.sh b/build/make/configure.sh index ed3a34f78..5e4b23b6b 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -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} diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh index eb482a4cb..477dec7fe 100755 --- a/build/make/gen_msvs_proj.sh +++ b/build/make/gen_msvs_proj.sh @@ -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" \ diff --git a/examples/decoder_tmpl.c b/examples/decoder_tmpl.c index deea4499e..91916bf17 100644 --- a/examples/decoder_tmpl.c +++ b/examples/decoder_tmpl.c @@ -17,10 +17,8 @@ #include #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 diff --git a/examples/encoder_tmpl.c b/examples/encoder_tmpl.c index 2df893af8..38aa6642f 100644 --- a/examples/encoder_tmpl.c +++ b/examples/encoder_tmpl.c @@ -17,11 +17,9 @@ #include #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) diff --git a/ivfenc.c b/ivfenc.c index bef3d589b..6295a0466 100644 --- a/ivfenc.c +++ b/ivfenc.c @@ -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 #include @@ -25,9 +29,7 @@ #include #include #endif -#if CONFIG_VP8_ENCODER #include "vp8cx.h" -#endif #include "vpx_ports/mem_ops.h" #include "vpx_ports/vpx_timer.h" diff --git a/libs.mk b/libs.mk index f741dba78..16b4763d4 100644 --- a/libs.mk +++ b/libs.mk @@ -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/ diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index ac110f761..6384fac8e 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -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(); diff --git a/vpx_codec/src/vpx_codec.c b/vpx_codec/src/vpx_codec.c index 63664164d..ace449413 100644 --- a/vpx_codec/src/vpx_codec.c +++ b/vpx_codec/src/vpx_codec.c @@ -14,6 +14,7 @@ */ #include #include +#include "vpx_ports/vpx_integer.h" #include "vpx_codec/internal/vpx_codec_internal.h" #include "vpx_version.h" diff --git a/vpx_codec/vpx_codec.h b/vpx_codec/vpx_codec.h index d18505c69..145ca29fa 100644 --- a/vpx_codec/vpx_codec.h +++ b/vpx_codec/vpx_codec.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 */ diff --git a/vpx_ports/config.h b/vpx_ports/config.h index da381372d..b87669ec1 100644 --- a/vpx_ports/config.h +++ b/vpx_ports/config.h @@ -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" diff --git a/vpx_ports/vpx_integer.h b/vpx_ports/vpx_integer.h index d3f7ddd7c..e250422b0 100644 --- a/vpx_ports/vpx_integer.h +++ b/vpx_ports/vpx_integer.h @@ -14,13 +14,7 @@ /* get ptrdiff_t, size_t, wchar_t, NULL */ #include -#if defined(HAVE_STDINT_H) && HAVE_STDINT_H -#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) -#define __STDC_FORMAT_MACROS -#endif -#include -#include -#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 +#include + #endif #endif diff --git a/vpx_ports/vpxtypes.h b/vpx_ports/vpxtypes.h index 86525b7e1..14244bd68 100644 --- a/vpx_ports/vpxtypes.h +++ b/vpx_ports/vpxtypes.h @@ -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 #ifdef _MSC_VER diff --git a/vpx_scale/arm/scalesystemdependant.c b/vpx_scale/arm/scalesystemdependant.c index 3c355becc..b270a5f06 100644 --- a/vpx_scale/arm/scalesystemdependant.c +++ b/vpx_scale/arm/scalesystemdependant.c @@ -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); diff --git a/vpx_scale/generic/scalesystemdependant.c b/vpx_scale/generic/scalesystemdependant.c index 28f5c7252..542e5daa9 100644 --- a/vpx_scale/generic/scalesystemdependant.c +++ b/vpx_scale/generic/scalesystemdependant.c @@ -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);