reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-03 18:45:46 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from dreamstalker/_28

Browse Source 
Fixed #28: Link libstdc++ statically on linux
This commit is contained in:
dreamstalker 2015-06-06 23:55:37 +04:00
commit 324ff95e72
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -48,5 +48,5 @@ project.version = versionInfo.asMavenVersion()
apply from: 'publish.gradle' apply from: 'publish.gradle'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.4-rc-2' gradleVersion = '2.4'
} }

2
buildSrc/build.gradle
View File

@ -19,7 +19,7 @@ dependencies {
compile 'commons-lang:commons-lang:2.6' compile 'commons-lang:commons-lang:2.6'
compile 'joda-time:joda-time:2.7' 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' compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.0.201502260915-r'

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sat May 02 13:29:15 BRT 2015 #Sat Jun 06 16:31:05 BRT 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
rehlds/build.gradle
View File

@ -156,7 +156,7 @@ void setupToolchain(NativeBinarySpec b) {
]) ])
cfg.compilerOptions.args '-Qoption,cpp,--treat_func_as_string_literal_cpp' cfg.compilerOptions.args '-Qoption,cpp,--treat_func_as_string_literal_cpp'
cfg.projectLibpath(project, '/lib/linux32') cfg.projectLibpath(project, '/lib/linux32')
cfg.extraLibs 'dl', 'm', 'stdc++', 'steam_api' cfg.extraLibs 'dl', 'm', 'steam_api'
} }
if (!unitTestExecutable && !swdsLib) { if (!unitTestExecutable && !swdsLib) {

2
shared_icc.gradle
View File

@ -24,6 +24,7 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
stripSymbolTable: true, stripSymbolTable: true,
staticLibGcc: true, staticLibGcc: true,
staticIntel: true, staticIntel: true,
staticLibStdCpp: true,
), ),
librarianOptions: new GccToolchainConfig.LibrarianOptions( librarianOptions: new GccToolchainConfig.LibrarianOptions(
@ -48,6 +49,7 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
stripSymbolTable: false, stripSymbolTable: false,
staticLibGcc: true, staticLibGcc: true,
staticIntel: true, staticIntel: true,
staticLibStdCpp: true,
), ),
librarianOptions: new GccToolchainConfig.LibrarianOptions( librarianOptions: new GccToolchainConfig.LibrarianOptions(