From d1bebde16276dfde094f9ff6c010ee1a84379940 Mon Sep 17 00:00:00 2001 From: Christian Fuchs Date: Fri, 22 Mar 2013 17:02:09 +0000 Subject: * added vpn and exit to the default build options for mingw/windows builds. This code is considered experimental and has not yet undergone intensive testing. Use it at your own peril, but we would still be really glad for feedback and bug reports! (thanks!) * fixed a typo in the exit-makefile (buildflags) * adjusted output of gnunet-helper-exit-windows to properly identify itself * updated driver-paths for looking for tap32/tap64 --- src/exit/Makefile.am | 2 +- src/exit/gnunet-helper-exit-windows.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/exit') diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index eb2a7a9aa..d350d86e2 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/include if MINGW - WINFLAGS = -Wl,--no-undefined, --export-all-symbols + WINFLAGS = -Wl,--no-undefined,--export-all-symbols EXITBIN = gnunet-helper-exit endif diff --git a/src/exit/gnunet-helper-exit-windows.c b/src/exit/gnunet-helper-exit-windows.c index 6b80d83d4..a2235bf38 100644 --- a/src/exit/gnunet-helper-exit-windows.c +++ b/src/exit/gnunet-helper-exit-windows.c @@ -71,13 +71,13 @@ * Name or Path+Name of our win32 driver. * The .sys and .cat files HAVE to be in the same location as this file! */ -#define INF_FILE "share/gnunet/tapw32/OemWin2k.inf" +#define INF_FILE "share/gnunet/openvpn-tap32/tapw32/OemWin2k.inf" /** * Name or Path+Name of our win64 driver. * The .sys and .cat files HAVE to be in the same location as this file! */ -#define INF_FILE64 "share/gnunet/tapw64/OemWin2k.inf" +#define INF_FILE64 "share/gnunet/openvpn-tap32/tapw64/OemWin2k.inf" /** * Hardware ID used in the inf-file. @@ -1466,7 +1466,7 @@ main (int argc, char **argv) if (6 != argc) { - fprintf (stderr, "FATAL: must supply 5 arguments\nUsage:\ngnunet-helper-vpn \n", argv[0]); + fprintf (stderr, "FATAL: must supply 6 arguments\nUsage:\ngnunet-helper-exit \n", argv[0]); return 1; } -- cgit v1.2.3