linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2234
committer: Jacek Sieka <arnetheduck@xxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-09-05 22:04:54 +0800
message:
  remove stlport support
removed:
  stlport/
modified:
  SConstruct
  changelog.txt


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-09-01 18:36:57 +0000
+++ SConstruct	2010-09-05 14:04:54 +0000
@@ -72,7 +72,6 @@
 opts.AddVariables(
 	EnumVariable('tools', 'Toolset to compile with, default = platform default (msvc under windows)', 'mingw', ['mingw', 'default']),
 	EnumVariable('mode', 'Compile mode', 'debug', ['debug', 'release']),
-	BoolVariable('nativestl', 'Use native STL instead of STLPort', 'yes'),
 	BoolVariable('gch', 'Use GCH when compiling GUI (disable if you have linking problems with mingw)', 'yes'),
 	BoolVariable('verbose', 'Show verbose command lines', 'no'),
 	BoolVariable('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
@@ -127,15 +126,6 @@
 if dev.is_win32():
 	env.Append(CPPDEFINES = ['BOOST_ALL_NO_LIB', 'BOOST_USE_WINDOWS_H'])
 
-if not env['nativestl']:
-	env.Append(CPPPATH = ['#/stlport/stlport/'])
-	env.Append(LIBPATH = ['#/stlport/lib/'])
-	env.Append(CPPDEFINES = ['HAVE_STLPORT', '_STLP_USE_STATIC_LIB=1'])
-	if mode == 'debug':
-		env.Append(LIBS = ['stlportg.5.1'])
-	else:
-		env.Append(LIBS = ['stlport.5.1'])
-
 if 'gcc' in env['TOOLS']:
 	if env['savetemps']:
 		env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])

=== modified file 'changelog.txt'
--- changelog.txt	2010-08-30 14:04:10 +0000
+++ changelog.txt	2010-09-05 14:04:54 +0000
@@ -18,6 +18,7 @@
 * [L#617591] Fix multi-core/cpu issue with ref-counting (thanks gennady proskurin)
 * Fix some counters that could have caused issues when running dc++ for a long time
 * [L#617517] More portable critical sections (thanks big muscle)
+* Removed stlport support (probably defunct by now...)
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== removed directory 'stlport'