Skip to content

Commit

Permalink
Switch to TARGET_ defines like xbmc
Browse files Browse the repository at this point in the history
  • Loading branch information
popcornmix committed Jul 16, 2013
1 parent 22bacf4 commit 6f6e957
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include Makefile.include

CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST

LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
Expand Down
2 changes: 1 addition & 1 deletion Makefile.ffmpeg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include Makefile.include

CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT
CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT

WORK=$(PWD)

Expand Down
2 changes: 1 addition & 1 deletion OMXAudioCodecOMX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#include "OMXAudioCodecOMX.h"
#ifdef _LINUX
#ifdef TARGET_LINUX
#include "XMemUtils.h"
#endif
#include "utils/log.h"
Expand Down
6 changes: 3 additions & 3 deletions OMXCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*
*/

#if (defined HAVE_CONFIG_H) && (!defined WIN32)
#if (defined HAVE_CONFIG_H) && (!defined TARGET_WINDOWS)
#include "config.h"
#elif defined(_WIN32)
#elif defined(TARGET_WINDOWS)
#include "system.h"
#endif

Expand All @@ -33,7 +33,7 @@

#include "OMXClock.h"

#ifdef _LINUX
#ifdef TARGET_LINUX
#include "XMemUtils.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion OMXStreamInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#if (defined HAVE_CONFIG_H) && (!defined WIN32)
#include "config.h"
#endif
#ifndef _LINUX
#ifndef TARGET_LINUX
enum AVCodecID;
#else
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions linux/PlatformDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
*/

#ifdef _LINUX
#ifdef TARGET_LINUX

#define LINE_ENDING "\n"

Expand Down Expand Up @@ -121,7 +121,7 @@
#define PRIuS "zu"
#endif

#ifdef _LINUX
#ifdef TARGET_LINUX

#define XXLog(a,b) printf("%s", (b))

Expand Down
2 changes: 1 addition & 1 deletion linux/XSyncUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "PlatformDefs.h"
#include "XHandlePublic.h"

#ifdef _LINUX
#ifdef TARGET_LINUX

#define STATUS_WAIT_0 ((DWORD )0x00000000L)
#define WAIT_FAILED ((DWORD)0xFFFFFFFF)
Expand Down
4 changes: 2 additions & 2 deletions utils/MathUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace MathUtils
const float round_to_nearest = 0.5f;
int i;

#ifndef _LINUX
#ifndef TARGET_LINUX
__asm
{
fld x
Expand Down Expand Up @@ -135,7 +135,7 @@ namespace MathUtils
#endif
int i;

#ifndef _LINUX
#ifndef TARGET_LINUX
__asm
{
fld x
Expand Down
4 changes: 2 additions & 2 deletions utils/StdString.h
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2)
res = conv.in(st,
pSrcA, pSrcA + nSrc, pNextSrcA,
pDstW, pDstW + nDst, pNextDstW);
#ifdef _LINUX
#ifdef TARGET_LINUX
#define ASSERT2(a) if (!(a)) {fprintf(stderr, "StdString: Assertion Failed on line %d\n", __LINE__);}
#else
#define ASSERT2 ASSERT
Expand Down Expand Up @@ -919,7 +919,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2)
res = conv.out(st,
pSrcW, pSrcW + nSrc, pNextSrcW,
pDstA, pDstA + nDst, pNextDstA);
#ifdef _LINUX
#ifdef TARGET_LINUX
#define ASSERT2(a) if (!(a)) {fprintf(stderr, "StdString: Assertion Failed on line %d\n", __LINE__);}
#else
#define ASSERT2 ASSERT
Expand Down

0 comments on commit 6f6e957

Please sign in to comment.