Index: build/win32/libx264.dsp =================================================================== --- build/win32/libx264.dsp (revision 667) +++ build/win32/libx264.dsp (working copy) @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /GX /O2 /Ob2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMX" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /c +# ADD CPP /nologo /G6 /W3 /GX /O2 /Ob2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x804 /d "NDEBUG" # ADD RSC /l 0x804 /d "NDEBUG" @@ -65,7 +65,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMX" /D "ARCH_X86" /D "HAVE_STDINT_H" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x804 /d "_DEBUG" # ADD RSC /l 0x804 /d "_DEBUG" Index: build/win32/libx264.vcproj =================================================================== --- build/win32/libx264.vcproj (revision 667) +++ build/win32/libx264.vcproj (working copy) @@ -25,7 +25,7 @@ InlineFunctionExpansion="2" OptimizeForProcessor="2" AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.." - PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H" + PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" @@ -75,7 +75,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.." - PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H" + PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__X264__" BasicRuntimeChecks="3" RuntimeLibrary="5" PrecompiledHeaderFile=".\Debug/libx264.pch" @@ -127,7 +127,7 @@ InlineFunctionExpansion="2" OptimizeForProcessor="2" AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.." - PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H" + PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" Index: build/win32/x264.dsp =================================================================== --- build/win32/x264.dsp (revision 667) +++ build/win32/x264.dsp (working copy) @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMX" /D "HAVE_STDINT_H" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x804 /d "NDEBUG" # ADD RSC /l 0x804 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMX" /D "HAVE_STDINT_H" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /YX /FD /GZ /c # ADD BASE RSC /l 0x804 /d "_DEBUG" # ADD RSC /l 0x804 /d "_DEBUG" BSC32=bscmake.exe Index: build/win32/x264.vcproj =================================================================== --- build/win32/x264.vcproj (revision 667) +++ build/win32/x264.vcproj (working copy) @@ -23,7 +23,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;L:\gpac\include" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT" + PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__" BasicRuntimeChecks="3" RuntimeLibrary="5" UsePrecompiledHeader="2" @@ -85,7 +85,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;L:\gpac\include" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT" + PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -146,7 +146,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;..\..\..\gpac\include" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT" + PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" Index: common/osdep.h =================================================================== --- common/osdep.h (revision 667) +++ common/osdep.h (working copy) @@ -1,5 +1,5 @@ /***************************************************************************** - * common.h: h264 encoder + * osdep.h: h264 encoder ***************************************************************************** * Copyright (C) 2007 x264 project * @@ -21,6 +21,13 @@ #ifndef _OSDEP_H #define _OSDEP_H +#ifndef _MSC_VER +#include "config.h" +#else +#include "config_alt.h" +#endif + + #ifdef HAVE_STDINT_H #include #else @@ -50,7 +57,7 @@ #if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX) #define sqrtf sqrt #endif -#ifdef __WIN32__ +#if defined (__WIN32__) || defined(_MSC_VER) #define rename(src,dst) (unlink(dst), rename(src,dst)) // POSIX says that rename() removes the destination, but win32 doesn't. #ifndef strtok_r #define strtok_r(str,delim,save) strtok(str,delim) Index: config_alt.h =================================================================== --- config_alt.h (revision 0) +++ config_alt.h (revision 0) @@ -0,0 +1,30 @@ +/***************************************************************************** + * config_alt.h: alternative (manual )config.h for autoconf-disabled platforms + ***************************************************************************** + * Copyright (C) 2007 x264 project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ +#ifndef __CONFIG_ALT_H +#define __CONFIG_ALT_H + +#define AVIS_INPUT +#define ARCH_X86 +#define HAVE_STDINT_H +//#define HAVE_MMX +//#define HAVE_PTHREAD +//#define MP4_OUTPUT + +#endif Index: encoder/set.c =================================================================== --- encoder/set.c (revision 667) +++ encoder/set.c (working copy) @@ -24,9 +24,6 @@ #include #include "common/common.h" -#ifndef _MSC_VER -#include "config.h" -#endif static void transpose( uint8_t *buf, int w ) { Index: muxers.c =================================================================== --- muxers.c (revision 667) +++ muxers.c (working copy) @@ -25,9 +25,6 @@ #include "matroska.h" #include "muxers.h" -#ifndef _MSC_VER -#include "config.h" -#endif #ifdef AVIS_INPUT #include Index: x264.c =================================================================== --- x264.c (revision 667) +++ x264.c (working copy) @@ -32,9 +32,6 @@ #include "x264.h" #include "muxers.h" -#ifndef _MSC_VER -#include "config.h" -#endif uint8_t *mux_buffer = NULL; int mux_buffer_size = 0;