Commit b0495a99 authored by Eric Petit's avatar Eric Petit

BeOS fixes (no stdint.h, no libm)


git-svn-id: svn://svn.videolan.org/x264/trunk@15 df754926-b1dd-0310-bc7b-ec298dee348c
parent bf06e99e
......@@ -40,11 +40,17 @@ if $(OSPLAT) = X86
SOURCES_X264 += $(SOURCES_X86) ;
ASFLAGS = -f elf ;
if $(OS) != BEOS
{
DEFINES += HAVE_STDINT_H ;
}
# Don't ask
NOARUPDATE = false ;
}
if $(OSPLAT) = PPC
{
DEFINES += HAVE_STDINT_H ;
SOURCES_X264 += $(SOURCES_ALTIVEC) ;
OPTIM += -falign-loops=16 ;
......@@ -60,7 +66,10 @@ if $(OSPLAT) = PPC
Library libx264 : $(SOURCES_X264) ;
# x264
LINKLIBS += -lm ;
if $(OS) != BEOS
{
LINKLIBS += -lm ;
}
LinkLibraries x264 : libx264.a ;
Main x264 : x264.c ;
......
......@@ -20,9 +20,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include "common.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
......
......@@ -24,7 +24,11 @@
#ifndef _COMMON_H
#define _COMMON_H 1
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include "../x264.h"
#include "bs.h"
......
......@@ -21,9 +21,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include "../x264.h"
#include "cpu.h"
......
......@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include "common.h"
......
......@@ -21,8 +21,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <stdlib.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include "x264.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "common.h"
#include "macroblock.h"
......
......@@ -21,8 +21,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <stdlib.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include "x264.h"
......
......@@ -21,10 +21,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "x264.h" /* DECLARE_ALIGNED */
#include "../mc.h"
......
......@@ -24,8 +24,12 @@
/* XXX predict4x4 are inspired from ffmpeg h264 decoder
*/
#include <stdlib.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include "x264.h" /* for keyword inline */
#include "../predict.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "common.h"
#include "macroblock.h"
......
......@@ -21,10 +21,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../x264.h"
......
......@@ -21,8 +21,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <stdlib.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#if !(defined(_MSC_VER) || defined(__MINGW32__))
#include <sys/time.h>
......
......@@ -21,9 +21,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include "../x264.h"
#include "pixel.h"
......
......@@ -24,8 +24,12 @@
/* XXX predict4x4 are inspired from ffmpeg h264 decoder
*/
#include <stdlib.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include "x264.h"
#include "predict.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <math.h>
#include "../core/common.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "macroblock.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "../core/vlc.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <math.h>
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "macroblock.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "me.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../core/common.h"
#include "ratecontrol.h"
......
......@@ -21,10 +21,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifdef HAVE_STDINT_H
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "../x264.h"
#include "../core/bs.h"
......
......@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <math.h>
......@@ -37,8 +36,8 @@
#include <fcntl.h> /* _O_BINARY */
#endif
#include "x264.h"
#include "core/common.h"
#include "x264.h"
#define DATA_MAX 3000000
uint8_t data[DATA_MAX];
......
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