From 46cee2742019f7b0b3500485f1e83e20dc983245 Mon Sep 17 00:00:00 2001 From: Adrian Bondrescu Date: Sun, 19 Aug 2012 21:45:32 +0300 Subject: [PATCH] Make swift over UDP compilable. --- src/libswift_udp/SConstruct | 2 +- src/libswift_udp/tests/SConscript | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libswift_udp/SConstruct b/src/libswift_udp/SConstruct index ceca61f..849c26d 100644 --- a/src/libswift_udp/SConstruct +++ b/src/libswift_udp/SConstruct @@ -83,7 +83,7 @@ if sys.platform == "win32": APPSOURCE=['swift.cpp','httpgw.cpp','statsgw.cpp','cmdgw.cpp','getopt.c','getopt_long.c'] else: - libevent2path = '/arno/pkgs/libevent-2.0.15-arno-http' + libevent2path = '/usr/local/' # Enable the user defining external includes if 'CPPPATH' in os.environ: diff --git a/src/libswift_udp/tests/SConscript b/src/libswift_udp/tests/SConscript index 070c362..5659a57 100644 --- a/src/libswift_udp/tests/SConscript +++ b/src/libswift_udp/tests/SConscript @@ -24,28 +24,28 @@ env.Program( source=['binstest2.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='binstest3', source=['binstest3.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='dgramtest', source=['dgramtest.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='hashtest', source=['hashtest.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) # Arno: must be rewritten to libevent #env.Program( @@ -53,7 +53,7 @@ env.Program( # source=['ledbattest.cpp'], # CPPPATH=cpppath, # LIBS=libs, -# LIBPATH=libpath ) +# LIBPATH=libpath+":.." ) # Arno: must be rewritten to libevent #if sys.platform != "win32": @@ -63,33 +63,33 @@ env.Program( # source=['ledbattest2.cpp'], # CPPPATH=cpppath, # LIBS=libs, -# LIBPATH=libpath ) +# LIBPATH=libpath+":.." ) env.Program( target='freemap', source=['freemap.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='bin64test', source=['bin64test.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='transfertest', source=['transfertest.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) env.Program( target='connecttest', source=['connecttest.cpp'], CPPPATH=cpppath, LIBS=libs, - LIBPATH=libpath ) + LIBPATH=libpath+":.." ) -- 2.20.1