summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-06-27 22:26:27 +0000
committerrubidium <rubidium@openttd.org>2007-06-27 22:26:27 +0000
commit26d6ba98ee9227e1e1452c6707dcda0b8fc8f958 (patch)
tree1910216b927e686dc13fd9aa988a6c0cc702ee0a
parentc692d897cd1bdeb8d4e00349519a460fcdd2c262 (diff)
downloadopenttd-26d6ba98ee9227e1e1452c6707dcda0b8fc8f958.tar.xz
(svn r10365) -Fix: compiling without png and networking support under MSVC.
-rw-r--r--src/network/network_data.h5
-rw-r--r--src/spriteloader/png.cpp4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/network/network_data.h b/src/network/network_data.h
index 02c112ae9..dfc1a8be1 100644
--- a/src/network/network_data.h
+++ b/src/network/network_data.h
@@ -3,11 +3,12 @@
#ifndef NETWORK_DATA_H
#define NETWORK_DATA_H
+#include "../openttd.h"
+#include "network.h"
+
// Is the network enabled?
#ifdef ENABLE_NETWORK
-#include "../openttd.h"
-#include "network.h"
#include "core/os_abstraction.h"
#include "core/core.h"
#include "core/config.h"
diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp
index 71f64a2bf..6048c6fdd 100644
--- a/src/spriteloader/png.cpp
+++ b/src/spriteloader/png.cpp
@@ -2,6 +2,8 @@
/** @file grf.cpp */
+#ifdef WITH_PNG
+
#include "../stdafx.h"
#include "../gfx.h"
#include "../fileio.h"
@@ -184,3 +186,5 @@ bool SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, const char *filen
if (!LoadPNG(sprite, filename, file_pos, true)) return false;
return true;
}
+
+#endif /* WITH_PNG */