diff options
-rw-r--r-- | recipes-graphics/libgles/libgles-omap3.inc | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc index 6137097b..18ee7ff8 100644 --- a/recipes-graphics/libgles/libgles-omap3.inc +++ b/recipes-graphics/libgles/libgles-omap3.inc | |||
@@ -61,10 +61,11 @@ TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L$ | |||
61 | -L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir}" | 61 | -L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir}" |
62 | PARALLEL_MAKE = "" | 62 | PARALLEL_MAKE = "" |
63 | 63 | ||
64 | PLATFORM ?= "LinuxOMAP3" | ||
65 | |||
64 | do_compile() { | 66 | do_compile() { |
65 | export X11ROOT="${STAGING_DIR_HOST}/usr" | 67 | export X11ROOT="${STAGING_DIR_HOST}/usr" |
66 | export TOOLCHAIN="${TOOLCHAIN_PATH}" | 68 | export TOOLCHAIN="${TOOLCHAIN_PATH}" |
67 | export PLATFORM="LinuxOMAP3" | ||
68 | 69 | ||
69 | export PLAT_CC="${CC}" | 70 | export PLAT_CC="${CC}" |
70 | export PLAT_CPP="${CXX}" | 71 | export PLAT_CPP="${CXX}" |
@@ -77,23 +78,23 @@ do_compile() { | |||
77 | for X11BUILD in 0 1 ; do | 78 | for X11BUILD in 0 1 ; do |
78 | for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do | 79 | for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do |
79 | cd $demo/OGLES/Build/LinuxGeneric | 80 | cd $demo/OGLES/Build/LinuxGeneric |
80 | oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD | 81 | oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=$X11BUILD |
81 | rm $demo/OGLES/Build/LinuxOMAP3/Release*/*.o | 82 | rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o |
82 | install -m 0755 $demo/OGLES/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true | 83 | install -m 0755 $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true |
83 | sed -e s:NAME:$(basename $demo): \ | 84 | sed -e s:NAME:$(basename $demo): \ |
84 | -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES/Build/LinuxOMAP3/ReleaseX11/*): \ | 85 | -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \ |
85 | ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop | 86 | ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop |
86 | install -m 0755 $demo/OGLES/Build/LinuxOMAP3/ReleaseRaw/* ${S}/demos/raw || true | 87 | install -m 0755 $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true |
87 | done | 88 | done |
88 | for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do | 89 | for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do |
89 | cd $demo/OGLES2/Build/LinuxGeneric | 90 | cd $demo/OGLES2/Build/LinuxGeneric |
90 | oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD | 91 | oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=$X11BUILD |
91 | rm -f $demo/OGLES2/Build/LinuxOMAP3/Release*/*.o | 92 | rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o |
92 | install -m 0755 $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true | 93 | install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true |
93 | sed -e s:NAME:$(basename $demo): \ | 94 | sed -e s:NAME:$(basename $demo): \ |
94 | -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/*): \ | 95 | -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \ |
95 | ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop | 96 | ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop |
96 | install -m 0755 $demo/OGLES2/Build/LinuxOMAP3/ReleaseRaw/* ${S}/demos/raw || true | 97 | install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true |
97 | done | 98 | done |
98 | done | 99 | done |
99 | 100 | ||
@@ -109,14 +110,14 @@ do_compile() { | |||
109 | cd $training/OGLES2/Build/LinuxGeneric | 110 | cd $training/OGLES2/Build/LinuxGeneric |
110 | fi | 111 | fi |
111 | 112 | ||
112 | if [ -e $training/OGLES2/Build/LinuxOMAP3/Makefile ] ; then | 113 | if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then |
113 | cd $training/OGLES2/Build/LinuxOMAP3 | 114 | cd $training/OGLES2/Build/${PLATFORM} |
114 | fi | 115 | fi |
115 | 116 | ||
116 | oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD | 117 | oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=$X11BUILD |
117 | rm -f $training/OGLES2/Build/LinuxOMAP3/Release*/*.o | 118 | rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o |
118 | install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/trainingcourses/x11 || true | 119 | install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/trainingcourses/x11 || true |
119 | install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseRaw/* ${S}/trainingcourses/raw || true | 120 | install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/trainingcourses/raw || true |
120 | done | 121 | done |
121 | done | 122 | done |
122 | 123 | ||
@@ -137,7 +138,7 @@ do_install () { | |||
137 | install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/ | 138 | install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/ |
138 | 139 | ||
139 | install -m 0755 ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx ${D}${bindir}/|| true | 140 | install -m 0755 ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx ${D}${bindir}/|| true |
140 | cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/lib/*X11WS* ${D}${libdir} || true | 141 | cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/lib/*X11WS* ${D}${libdir} || true |
141 | 142 | ||
142 | install -d ${D}${includedir} | 143 | install -d ${D}${includedir} |
143 | cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/ | 144 | cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/ |
@@ -145,8 +146,8 @@ do_install () { | |||
145 | 146 | ||
146 | cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/ | 147 | cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/ |
147 | cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/ | 148 | cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/ |
148 | cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ || true | 149 | cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES/ || true |
149 | cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ || true | 150 | cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES2/ || true |
150 | cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ || true | 151 | cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ || true |
151 | cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ || true | 152 | cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ || true |
152 | cp -pPr ${S}/include/*.h ${D}${includedir} || true | 153 | cp -pPr ${S}/include/*.h ${D}${includedir} || true |