diff options
| -rw-r--r-- | network.h | 1 | ||||
| -rw-r--r-- | network_core.h | 3 | ||||
| -rw-r--r-- | network_data.h | 1 | ||||
| -rw-r--r-- | ttd.dsp | 4 | ||||
| -rw-r--r-- | ttd.vcproj | 4 |
5 files changed, 6 insertions, 7 deletions
@@ -1,7 +1,6 @@ #ifndef NETWORK_H #define NETWORK_H -#include "network_core.h" #define NOREV_STRING "norev000" #ifdef ENABLE_NETWORK diff --git a/network_core.h b/network_core.h index 2d9f83c7b..337de1853 100644 --- a/network_core.h +++ b/network_core.h @@ -18,7 +18,6 @@ #endif //_MSC_VER #if ! (defined(__MINGW32__) || defined(__CYGWIN__)) - #define ENABLE_NETWORK // On windows, the network is always enabled // Windows has some different names for some types.. typedef SSIZE_T ssize_t; typedef int socklen_t; @@ -89,7 +88,7 @@ typedef struct ifreq IFREQ; #endif // UNIX #ifdef __BEOS__ -typedef int socklen_t; + typedef int socklen_t; #endif // OS/2 stuff diff --git a/network_data.h b/network_data.h index 1210ca8f5..18a0a2a1b 100644 --- a/network_data.h +++ b/network_data.h @@ -3,6 +3,7 @@ #include "ttd.h" #include "network.h" +#include "network_core.h" // Is the network enabled? #ifdef ENABLE_NETWORK @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /YX"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /YX"stdafx.h" /FD /GZ /c
# SUBTRACT CPP /WX /Fr
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -126,7 +126,7 @@ LINK32=link.exe # PROP Target_Dir ""
# ADD BASE CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /FAcs /FR /Yu"stdafx.h" /J /FD /c
# SUBTRACT BASE CPP /WX /Ot
-# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /FAcs /FR /Yu"stdafx.h" /J /FD /c
+# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
# SUBTRACT CPP /WX /Ot
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
diff --git a/ttd.vcproj b/ttd.vcproj index 643ab8f40..6852b1359 100644 --- a/ttd.vcproj +++ b/ttd.vcproj @@ -28,7 +28,7 @@ FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
OptimizeForProcessor="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="4"
@@ -175,7 +175,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_PNG"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
UsePrecompiledHeader="2"
|