diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index dcbbd67ffb..c1b66d62a0 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -251,7 +251,12 @@ InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h LightsManager.cpp Ligh MemoryCardManager.cpp MemoryCardManager.h NetworkSyncManager.cpp NetworkSyncManager.h \ NoteSkinManager.cpp NoteSkinManager.h PrefsManager.cpp PrefsManager.h ProfileManager.cpp ProfileManager.h \ ScreenManager.cpp ScreenManager.h SongManager.cpp SongManager.h ThemeManager.cpp ThemeManager.h \ -UnlockSystem.cpp UnlockSystem.h ezsockets.cpp ezsockets.h +UnlockSystem.cpp UnlockSystem.h + +if !WITHOUT_NETWORKING +# Compile NetworkSyncManager even if networking is disabled; it'll stub itself. +GlobalSingletons += ezsockets.cpp ezsockets.h +endif crypto = \ crypto/CryptBn.cpp crypto/CryptBn.h crypto/CryptMD5.cpp crypto/CryptMD5.h crypto/CryptNoise.cpp \ diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index b47b13a9a4..f9dbe16f07 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -1,6 +1,24 @@ #include "global.h" -#include "ezsockets.h" #include "NetworkSyncManager.h" + +NetworkSyncManager *NSMAN; + +#if !defined(WITH_NETWORKING) + +NetworkSyncManager::NetworkSyncManager() { } +NetworkSyncManager::~NetworkSyncManager () { } +void NetworkSyncManager::CloseConnection() { } +void NetworkSyncManager::PostStartUp( CString ServerIP ) { } +bool NetworkSyncManager::Connect(const CString& addy, unsigned short port) { return false; } +void NetworkSyncManager::ReportScore(int playerID, int step, int score, int combo) { } +void NetworkSyncManager::ReportSongOver() { } +void NetworkSyncManager::StartRequest() { } +void NetworkSyncManager::SendSongs() { } +void NetworkSyncManager::DisplayStartupStatus() { } +void NetworkSyncManager::Update( float fDeltaTime ) { } + +#else +#include "ezsockets.h" #include "ProfileManager.h" #include "RageLog.h" #include "StepMania.h" @@ -18,8 +36,6 @@ #include "StageStats.h" #include "Steps.h" -NetworkSyncManager *NSMAN; - NetworkSyncManager::NetworkSyncManager() { NetPlayerClient = new EzSockets; @@ -336,6 +352,7 @@ void NetworkSyncManager::DisplayStartupStatus() void NetworkSyncManager::Update(float fDeltaTime) { } +#endif /* * (c) 2003-2004 Charles Lohr, Joshua Allen diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h index cfb987c8b4..2bd928c0d9 100644 --- a/stepmania/src/NetworkSyncManager.h +++ b/stepmania/src/NetworkSyncManager.h @@ -32,7 +32,7 @@ public: void Update(float fDeltaTime); private: - +#if defined(WITH_NETWORKING) void StartUp(); int m_playerID; //these are currently unused, but need to stay @@ -74,7 +74,7 @@ private: { char data[73]; }; - +#endif }; extern NetworkSyncManager *NSMAN;