diff --git a/deps/mongoose b/deps/mongoose index d6dda04f..806f07db 160000 --- a/deps/mongoose +++ b/deps/mongoose @@ -1 +1 @@ -Subproject commit d6dda04f4f00016e12618d0b55c972498e6249b5 +Subproject commit 806f07db67b624ceb6638a3bf0713286f75e996d diff --git a/deps/protobuf b/deps/protobuf index 86fcd879..e0e54661 160000 --- a/deps/protobuf +++ b/deps/protobuf @@ -1 +1 @@ -Subproject commit 86fcd879b38505446799b2f2a2929415ddad620a +Subproject commit e0e54661f76183684dca66694967a60cbb10f04e diff --git a/src/STDInclude.cpp b/src/STDInclude.cpp index 037fe84b..0c4c52fb 100644 --- a/src/STDInclude.cpp +++ b/src/STDInclude.cpp @@ -2,13 +2,15 @@ // Rename sections #ifndef DEBUG -#pragma comment(linker, "/merge:.text=.fucker") -#pragma comment(linker, "/merge:.data=.bastard") -#pragma comment(linker, "/merge:.rdata=.faggot") -#pragma comment(linker, "/merge:.tls=.asshole") -#pragma comment(linker, "/merge:.gfids=.idiot") +#pragma comment(linker, "/merge:.text=.UPX0") +#pragma comment(linker, "/merge:.data=.UPX1") +#pragma comment(linker, "/merge:.rdata=.UPX2") +#pragma comment(linker, "/merge:.tls=.UPX3") +#pragma comment(linker, "/merge:.gfids=.UPX4") #endif +#pragma comment(linker,"\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") + // Do necessary assertions here // Some compilers treat them differently which causes a size mismatch diff --git a/tools/protoc.exe b/tools/protoc.exe index 9285f90e..de5e3f2a 100644 Binary files a/tools/protoc.exe and b/tools/protoc.exe differ