mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11689) -Fix: compilation error and most of warnings for gcc 4.3
This commit is contained in:
parent
22f79df328
commit
17d1b522bc
|
@ -885,6 +885,12 @@ make_cflags_and_ldflags() {
|
||||||
CFLAGS="$CFLAGS -fno-strict-overflow"
|
CFLAGS="$CFLAGS -fno-strict-overflow"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# GCC 4.3+ gives a warning about empty body of
|
||||||
|
# loops and conditions
|
||||||
|
if [ $cc_version -ge 43 ]; then
|
||||||
|
CFLAGS="$CFLAGS -Wno-empty-body"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
|
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
|
||||||
LIBS="$LIBS -lpthread"
|
LIBS="$LIBS -lpthread"
|
||||||
LIBS="$LIBS -lrt"
|
LIBS="$LIBS -lrt"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
|
|
||||||
template<uint N> static inline void ExtractValid();
|
template<uint N> static inline void ExtractValid();
|
||||||
template<> static inline void ExtractValid<1>() {}
|
template<> inline void ExtractValid<1>() {}
|
||||||
|
|
||||||
|
|
||||||
template<typename T> struct ExtractBits;
|
template<typename T> struct ExtractBits;
|
||||||
|
|
|
@ -1173,7 +1173,7 @@ enum BuildSignalWidgets {
|
||||||
* @param xrel the relativ x value of the sprite in the grf
|
* @param xrel the relativ x value of the sprite in the grf
|
||||||
* @param xsize the width of the sprite
|
* @param xsize the width of the sprite
|
||||||
*/
|
*/
|
||||||
static const void DrawSignalSprite(const Window *w, byte widget_index, SpriteID image, int8 xrel, uint8 xsize)
|
static void DrawSignalSprite(const Window *w, byte widget_index, SpriteID image, int8 xrel, uint8 xsize)
|
||||||
{
|
{
|
||||||
DrawSprite(image + w->IsWidgetLowered(widget_index), PAL_NONE,
|
DrawSprite(image + w->IsWidgetLowered(widget_index), PAL_NONE,
|
||||||
w->widget[widget_index].left + (w->widget[widget_index].right - w->widget[widget_index].left) / 2 - xrel - xsize / 2 +
|
w->widget[widget_index].left + (w->widget[widget_index].right - w->widget[widget_index].left) / 2 - xrel - xsize / 2 +
|
||||||
|
|
|
@ -33,24 +33,24 @@ static const DrawTileSprites _road_depot[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSeqStruct _tram_depot_NE[] = {
|
static const DrawTileSeqStruct _tram_depot_NE[] = {
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x35 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1)
|
TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x35) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1)
|
||||||
TILE_SEQ_END()
|
TILE_SEQ_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSeqStruct _tram_depot_SE[] = {
|
static const DrawTileSeqStruct _tram_depot_SE[] = {
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x31, PAL_NONE, 0, 0, 1, 16)
|
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x31, PAL_NONE, 0, 0, 1, 16)
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x32 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16)
|
TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x32) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16)
|
||||||
TILE_SEQ_END()
|
TILE_SEQ_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSeqStruct _tram_depot_SW[] = {
|
static const DrawTileSeqStruct _tram_depot_SW[] = {
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x33, PAL_NONE, 0, 0, 16, 1)
|
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x33, PAL_NONE, 0, 0, 16, 1)
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x34 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1)
|
TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x34) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1)
|
||||||
TILE_SEQ_END()
|
TILE_SEQ_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSeqStruct _tram_depot_NW[] = {
|
static const DrawTileSeqStruct _tram_depot_NW[] = {
|
||||||
TILE_SEQ_LINE(SPR_TRAMWAY_BASE + 0x36 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16)
|
TILE_SEQ_LINE((SPR_TRAMWAY_BASE + 0x36) | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 15, 0, 1, 16)
|
||||||
TILE_SEQ_END()
|
TILE_SEQ_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue