Merge remote-tracking branch 'origin/develop' into jenkins

This commit is contained in:
/dev/urandom 2016-09-15 20:56:01 +02:00
commit ac289458ce
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E
4 changed files with 9 additions and 7 deletions

2
deps/mongoose vendored

@ -1 +1 @@
Subproject commit d6dda04f4f00016e12618d0b55c972498e6249b5
Subproject commit 806f07db67b624ceb6638a3bf0713286f75e996d

2
deps/protobuf vendored

@ -1 +1 @@
Subproject commit 86fcd879b38505446799b2f2a2929415ddad620a
Subproject commit e0e54661f76183684dca66694967a60cbb10f04e

View File

@ -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

Binary file not shown.