From 06f4c11b14926021f4286903074d5544f9f5ba34 Mon Sep 17 00:00:00 2001
From: Saurabh Bipin Chandra <a0131926@ti.com>
Date: Wed, 4 Sep 2013 19:58:45 +0530
Subject: [QNX-MAKE] Include XDC, CE, XDAIS, IVAHD Headers from packages

This patch adds std.h from GNU and it directs
the build system to include Codec Engine,
XDCTools, XDAIS and IVAHD Codec Header files
from the packages/ folder. This removes the
need for libdce users to install these tools.

Change-Id: I368a5aaff4c1edeaf6eae794bea9971787e036e3
Signed-off-by: Saurabh Bipin Chandra <a0131926@ti.com>
---
 common.mk                           | 23 +++--------
 packages/xdctools/gnu/targets/std.h | 82 +++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 packages/xdctools/gnu/targets/std.h

diff --git a/common.mk b/common.mk
index 0307a81..439f79c 100644
--- a/common.mk
+++ b/common.mk
@@ -15,27 +15,14 @@ CCFLAGS+=-O2 -Dxdc_target_types__=qnx/targets/arm/std.h -DBUILDOS_QNX=1
 # To get final library name as "libdce". Needed as project name is not dce
 NAME=dce
 
-### Add files to be included for Build
-TITOOLSROOT	?= /usr/local
-TIVIDEOTOOLSROOT	?= $(TITOOLSROOT)
-# Different tool versions can easily be programmed by defining below variables
-# in your environment.
-CEVERSION	?= codec_engine_3_24_00_08
-FCVERSION	?= framework_components_3_24_00_09
-XDAISVERSION	?= xdais_7_24_00_04
-XDCVERSION	?= xdctools_3_25_02_70
+# Path to IPC Header files
 IPCHEADERS	?= $(INSTALL_ROOT_nto)
 
-# Generate the full package paths for tools
-CEPROD		= $(TIVIDEOTOOLSROOT)/$(CEVERSION)
-FCPROD		= $(TIVIDEOTOOLSROOT)/$(FCVERSION)
-XDAISPROD	= $(TITOOLSROOT)/$(XDAISVERSION)
-XDCPROD	    = $(TITOOLSROOT)/$(XDCVERSION)
+EXTRA_INCVPATH += $(PROJECT_ROOT)/packages/codec_engine
+EXTRA_INCVPATH += $(PROJECT_ROOT)/packages/ivahd_codecs
+EXTRA_INCVPATH += $(PROJECT_ROOT)/packages/xdais
+EXTRA_INCVPATH += $(PROJECT_ROOT)/packages/xdctools
 
-EXTRA_INCVPATH += $(CEPROD)/packages
-EXTRA_INCVPATH += $(FCPROD)/packages
-EXTRA_INCVPATH += $(XDAISPROD)/packages
-EXTRA_INCVPATH += $(XDCPROD)/packages
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink/
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/ipc/mm
diff --git a/packages/xdctools/gnu/targets/std.h b/packages/xdctools/gnu/targets/std.h
new file mode 100644
index 0000000..326ae9b
--- /dev/null
+++ b/packages/xdctools/gnu/targets/std.h
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2008 Texas Instruments and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *      Texas Instruments - initial implementation
+ *
+ * */
+/*
+ *  ======== gnu/targets/std.h ========
+ *
+ */
+
+#ifndef gnu_targets_STD_
+#define gnu_targets_STD_
+
+/* include target-specific "portable" macros */
+#if defined(xdc_target_name__) & !defined(xdc_target_macros_include__)
+#include xdc__local_include(xdc_target_name__)
+#endif
+
+/*
+ * xdc__LONGLONG__ indicates if compiler supports 'long long' type
+ * xdc__BITS<n> __ indicates if compiler supports 'uint<n>_t' type
+ */
+#define xdc__LONGLONG__
+#define xdc__BITS8__
+#define xdc__BITS16__
+#define xdc__BITS32__
+#define xdc__BITS64__
+#define xdc__INT64__
+
+/*
+ *  ======== [U]Int<n> ========
+ */
+typedef signed char xdc_Int8;
+typedef unsigned char xdc_UInt8;
+typedef short xdc_Int16;
+typedef unsigned short xdc_UInt16;
+typedef int xdc_Int32;
+
+#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)   /* Cortex M */
+typedef unsigned xdc_UInt32;
+#else
+typedef unsigned long xdc_UInt32;
+#endif
+
+__extension__ typedef long long xdc_Int64;
+__extension__ typedef unsigned long long xdc_UInt64;
+
+/*
+ *  ======== Bits<n> ========
+ */
+typedef unsigned char xdc_Bits8;
+typedef unsigned short xdc_Bits16;
+typedef unsigned int xdc_Bits32;
+__extension__ typedef unsigned long long xdc_Bits64;
+
+/*
+ *  ======== [IU]Arg ========
+ */
+typedef long xdc_IArg;
+typedef unsigned long xdc_UArg;
+
+#define xdc__ARG__
+typedef xdc_IArg xdc_Arg;       /* deprecated, but compatible with BIOS 5.x */
+
+/*
+ *  ======== xdc__META ========
+ */
+#define xdc__META(n, s) __attribute__ ((section("xdc.meta"))) const char (n)[] = { s }
+
+#endif /* gnu_targets_STD_ */
+
+/*
+ *  @(#) gnu.targets; 1, 0, 1,603; 6-24-2013 15:21:46; /db/ztree/library/trees/xdctargets/xdctargets-g31x/src/ xlibrary
+
+ */
+
-- 
cgit v1.2.3