Author: rhuijben
Date: Mon Nov 2 21:54:48 2015
New Revision: 1712169
URL: http://svn.apache.org/viewvc?rev=1712169&view=rev
Log:
* SConstruct
Suppress a few warnings on Windows.
Remove code to specifically find the shared library while testing, now that
we assume that our tests always use the static library.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1712169&r1=1712168&r2=1712169&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Mon Nov 2 21:54:48 2015
@@ -280,7 +280,11 @@ if sys.platform != 'win32':
env.Append(PLATFORM='posix')
else:
# Warning level 4, no unused argument warnings
- env.Append(CCFLAGS=['/W4', '/wd4100'])
+ env.Append(CCFLAGS=['/W4',
+ '/wd4100', # Unused argument
+ '/wd4127', # Conditional expression is constant
+ '/wd4706', # Assignment within conditional expression
+ ])
# Choose runtime and optimization
if debug:
@@ -492,10 +496,6 @@ if sys.platform == 'win32':
else:
TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ]
-# Find the (dynamic) library in this directory
-tenv.Replace(RPATH=thisdir)
-tenv.Prepend(LIBPATH=[thisdir, ])
-
check_script = env.File('build/check.py').rstr()
test_dir = env.File('test/test_all.c').rfile().get_dir()
src_dir = env.File('serf.h').rfile().get_dir()
