[Olsr-cvs] olsrd-current/src/cfgparser Makefile, 1.21, 1.22 cfgfile_gen.c, 1.5, 1.6

Thomas Lopatic (spam-protected)
Tue Mar 27 05:05:23 CEST 2007


Update of /cvsroot/olsrd/olsrd-current/src/cfgparser
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29662

Modified Files:
	Makefile cfgfile_gen.c 
Log Message:
Write fish eye parameter to configuration file. Generate import library.

Index: Makefile
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	29 Dec 2005 19:48:43 -0000	1.21
--- Makefile	27 Mar 2007 03:05:21 -0000	1.22
***************
*** 70,78 ****
  
  ifeq (${OS}, osx)
! LDFLAGS += -dynamiclib -single_module
  else
  LDFLAGS +=	-shared -Wl,-soname,$(LIBNAME)
  endif
  
  CFLAGS +=	-DMAKELIB
  NAME =		$(LIBNAME)
--- 70,82 ----
  
  ifeq (${OS}, osx)
! LDFLAGS +=	-dynamiclib -single_module
  else
  LDFLAGS +=	-shared -Wl,-soname,$(LIBNAME)
  endif
  
+ ifeq (${OS}, win32)
+ LDFLAGS +=	-Wl,--out-implib=libolsrd_cfgparser.a -Wl,--export-all-symbols
+ endif
+ 
  CFLAGS +=	-DMAKELIB
  NAME =		$(LIBNAME)

Index: cfgfile_gen.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/cfgfile_gen.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cfgfile_gen.c	4 Feb 2007 22:37:36 -0000	1.5
--- cfgfile_gen.c	27 Mar 2007 03:05:21 -0000	1.6
***************
*** 195,198 ****
--- 195,201 ----
    fprintf(fd, "LinkQualityLevel\t%d\n\n", cnf->lq_level);
  
+   fprintf(fd, "# Fish Eye algorithm\n# 0 = do not use fish eye\n# 1 = use fish eye\n\n");
+   fprintf(fd, "LinkQualityFishEye\t%d\n\n", cnf->lq_fish);
+ 
    fprintf(fd, "# Link quality window size\n\n");
    fprintf(fd, "LinkQualityWinSize\t%d\n\n", cnf->lq_wsize);





More information about the Olsr-cvs mailing list