From b6c01cdd4c3f3b69bfcdeb3bcc133a5e2f023977 Mon Sep 17 00:00:00 2001
From: dreamstalker <dreamstalker777@gmail.com>
Date: Sat, 6 Jun 2015 23:33:44 +0400
Subject: [PATCH] Link libstdc++ statically on linux Updated gradle to 2.4
 Updated gradle-cpp-plugin to 1.2

---
 build.gradle                             | 2 +-
 buildSrc/build.gradle                    | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 rehlds/build.gradle                      | 2 +-
 shared_icc.gradle                        | 2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b4bd5c..d08279c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,5 +48,5 @@ project.version = versionInfo.asMavenVersion()
 apply from: 'publish.gradle'
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4-rc-2'
+    gradleVersion = '2.4'
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 6ebfb23..2226751 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile 'joda-time:joda-time:2.7'
 
-    compile 'org.doomedsociety.gradlecpp:gradle-cpp-plugin:1.1'
+    compile 'org.doomedsociety.gradlecpp:gradle-cpp-plugin:1.2'
 
     compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.0.201502260915-r'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 32de20a..af80948 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 02 13:29:15 BRT 2015
+#Sat Jun 06 16:31:05 BRT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-rc-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/rehlds/build.gradle b/rehlds/build.gradle
index ad4c03c..7c6e896 100644
--- a/rehlds/build.gradle
+++ b/rehlds/build.gradle
@@ -156,7 +156,7 @@ void setupToolchain(NativeBinarySpec b) {
         ])
         cfg.compilerOptions.args '-Qoption,cpp,--treat_func_as_string_literal_cpp'
         cfg.projectLibpath(project, '/lib/linux32')
-        cfg.extraLibs 'dl', 'm', 'stdc++', 'steam_api'
+        cfg.extraLibs 'dl', 'm', 'steam_api'
     }
 
     if (!unitTestExecutable && !swdsLib) {
diff --git a/shared_icc.gradle b/shared_icc.gradle
index 9dbd1f1..d812348 100644
--- a/shared_icc.gradle
+++ b/shared_icc.gradle
@@ -24,6 +24,7 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
                         stripSymbolTable: true,
                         staticLibGcc: true,
                         staticIntel: true,
+                        staticLibStdCpp: true,
                 ),
 
                 librarianOptions: new GccToolchainConfig.LibrarianOptions(
@@ -48,6 +49,7 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
                         stripSymbolTable: false,
                         staticLibGcc: true,
                         staticIntel: true,
+                        staticLibStdCpp: true,
                 ),
 
                 librarianOptions: new GccToolchainConfig.LibrarianOptions(