cpp/openttd-patchpack/source Changeset - r6901:0ac8fd77d505

Changeset - r6901:0ac8fd77d505

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

truelight - 17 years ago 2007-06-13 18:52:06
truelight@openttd.org

(svn r10148) -Fix r10143: make --without-png to compile again

4 files changed with 9 insertions and 0 deletions:

configure

projects/generate

source.list

src/spritecache.cpp

0 comments (0 inline, 0 general)

configure

➞

Show inline comments

@@ @@ -83,6 +83,7 @@ SRCS="`< $ROOT_DIR/source.list tr '\r' ' @@
 		deep += 1;
 		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }

projects/generate

➞

Show inline comments

@@ @@ -31,6 +31,7 @@ fi @@
 # First, collect the list of Windows files
 sdl_config="1"
 png_config="1"
 os="MSVC"
 enable_dedicated="0"
 with_cocoa="0"
@@ @@ -52,6 +53,7 @@ load_main_data() { @@
 			deep += 1;
 			if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 			if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 			if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 			if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 			if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }

source.list

➞

Show inline comments

@@ @@ -307,8 +307,10 @@ blitter/blitter.hpp @@
 # Sprite loaders
 spriteloader/grf.cpp
 spriteloader/grf.hpp
 #if PNG
 spriteloader/png.cpp
 spriteloader/png.hpp
 #end
 spriteloader/spriteloader.hpp
 # Renderer

src/spritecache.cpp

➞

Show inline comments

@@ @@ -14,7 +14,9 @@ @@
 #include "fileio.h"
 #include "helpers.hpp"
 #include "spriteloader/grf.hpp"
 #ifdef WITH_PNG
 #include "spriteloader/png.hpp"
 #endif /* WITH_PNG */
 #include "blitter/blitter.hpp"
 /* Default of 4MB spritecache */
@@ @@ -137,6 +139,7 @@ static void* ReadSprite(SpriteCache *sc, @@
 		file_pos = GetSpriteCache(SPR_IMG_QUERY)->file_pos;
+	}
 #ifdef WITH_PNG
 	if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 32) {
 		/* Try loading 32bpp graphics in case we are 32bpp output */
 		SpriteLoaderPNG sprite_loader;
@@ @@ -150,6 +153,7 @@ static void* ReadSprite(SpriteCache *sc, @@
+		}
 		/* If the PNG couldn't be loaded, fall back to 8bpp grfs */
+	}
 #endif /* WITH_PNG */
 	FioSeekToFile(file_pos);

0 comments (0 inline, 0 general)