Skip to content

Move NextGenTransport library linking to source file to prevent early DLL loading #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −10
Open

Move NextGenTransport library linking to source file to prevent early DLL loading #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenTransport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

#include "GameNetwork/GeneralsOnline/Vendor/ValveNetworkingSockets/steam/isteamnetworkingmessages.h"

#pragma comment(lib, "ValveNetworkingSockets/GameNetworkingSockets.lib")
#pragma comment(lib, "ValveNetworkingSockets/abseil_dll.lib")
#pragma comment(lib, "ValveNetworkingSockets/libcrypto.lib")
#pragma comment(lib, "ValveNetworkingSockets/libprotobuf.lib")
#pragma comment(lib, "ValveNetworkingSockets/libssl.lib")
#pragma comment(lib, "ValveNetworkingSockets/steamwebrtc.lib")
#pragma comment(lib, "ValveNetworkingSockets/webrtc-lite.lib")
#pragma comment(lib, "Secur32.lib")
// Library linking moved to NextGenTransport.cpp to prevent early DLL loading during static initialization
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */
/* Removed - moved to .cpp */

// it to be a MemoryPoolObject (srj)
class NextGenTransport : public Transport //: public MemoryPoolObject
Expand All @@ -42,4 +42,4 @@ class NextGenTransport : public Transport //: public MemoryPoolObject

private:

};
};
Expand Down
15 changes: 14 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NextGenTransport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@

#include "GameNetwork/GeneralsOnline/ngmp_include.h"
#include "GameNetwork/GeneralsOnline/ngmp_interfaces.h"

// Library linking directives moved here from NextGenTransport.h to prevent early DLL loading
// during static initialization. This ensures libraries are only loaded when NextGenTransport
// is actually instantiated (after the Windows application window has been created).
#pragma comment(lib, "ValveNetworkingSockets/GameNetworkingSockets.lib")
#pragma comment(lib, "ValveNetworkingSockets/abseil_dll.lib")
#pragma comment(lib, "ValveNetworkingSockets/libcrypto.lib")
#pragma comment(lib, "ValveNetworkingSockets/libprotobuf.lib")
#pragma comment(lib, "ValveNetworkingSockets/libssl.lib")
#pragma comment(lib, "ValveNetworkingSockets/steamwebrtc.lib")
#pragma comment(lib, "ValveNetworkingSockets/webrtc-lite.lib")
#pragma comment(lib, "Secur32.lib")


#ifdef _INTERNAL
// for occasional debugging...
Expand Down Expand Up @@ -264,4 +277,4 @@ Bool NextGenTransport::queueSend(UnsignedInt addr, UnsignedShort port, const Uns
}
}
return false;
}
}
Expand Down
Loading