Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-09 12:03:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Travis: Update to GCC 4.7.3 for Symbian.

Browse Source
This commit is contained in:
Sacha 2014-06-09 20:28:26 +10:00
parent 1bd44fd4e2
commit fd70cfa149
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -50,12 +50,11 @@ install:
# Symbian NDK: Belle # Symbian NDK: Belle
- elif [ "$PPSSPP_BUILD_TYPE" == "Symbian" ]; then - elif [ "$PPSSPP_BUILD_TYPE" == "Symbian" ]; then
sudo apt-get install lib32stdc++6 lib32bz2-1.0 -qq && sudo apt-get install lib32stdc++6 lib32bz2-1.0 -qq &&
download_extract https://googledrive.com/host/0B5UBD4wjtpZ-T0Iwa0F3b2JqREE ndk.tar.bz2 && download_extract https://github.com/xsacha/SymbianGCC/releases/download/4.7.3/gcc4.7.3_x86-64.tar.bz2 compiler.tar.bz2 &&
sed -i "s!/SDKs!$(pwd)/SDKs!" SDKs/SymbianSR1Qt474/bin/qt.conf && download_extract https://github.com/xsacha/SymbianGCC/releases/download/4.7.3/ndk.tar.bz2 ndk.tar.bz2 &&
sed -i "s!0xF00000!0x1000000!" tools/sbs/lib/config/gcce.xml && export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE473BIN=$(pwd)/gcc4.7.3_x86-64/bin &&
cp ffmpeg/symbian/armv6/lib/* SDKs/SymbianSR1Qt474/epoc32/release/armv5/urel/ && cp ffmpeg/symbian/armv6/lib/* $EPOCROOT/epoc32/release/armv5/urel/ &&
export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474 SBS_GCCE463BIN=$(pwd)/tools/gcce4/bin && PATH=$SBS_GCCE473BIN:$(pwd)/tools/sbs/bin:$EPOCROOT/epoc32/tools:$EPOCROOT/bin:$(pwd)/tools/sbs/linux-x86_64-libc2_15/bin:$PATH;
PATH=$SBS_GCCE463BIN:$(pwd)/tools/sbs/bin:$EPOCROOT/epoc32/tools:$(pwd)/tools:$EPOCROOT/bin:$(pwd)/tools/sbs/linux-x86_64-libc2_15/bin:$PATH;
fi fi
script: script:

2
GPU/Software/Rasterizer.cpp
View File

@ -1493,6 +1493,7 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
ScreenCoords pprime = ScreenCoords(x, y, z); ScreenCoords pprime = ScreenCoords(x, y, z);
#ifndef __SYMBIAN32__
// TODO: Fogging // TODO: Fogging
DrawingCoords p = TransformUnit::ScreenToDrawing(pprime); DrawingCoords p = TransformUnit::ScreenToDrawing(pprime);
@ -1501,6 +1502,7 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
} else { } else {
DrawSinglePixel<false>(p, z, prim_color); DrawSinglePixel<false>(p, z, prim_color);
} }
#endif
x = x + xinc; x = x + xinc;
y = y + yinc; y = y + yinc;