diff -dru kicad-dev/libs.linux kicad-dev-mine/libs.linux --- kicad-dev/libs.linux 2005-10-04 10:54:00.000000000 +0200 +++ kicad-dev-mine/libs.linux 2006-02-20 01:10:57.000000000 +0100 @@ -15,9 +15,9 @@ # path and version definition for wxWidgets and mesa libs MESALIBSPATH = /usr/local/lib WXPATH = `wx-config --prefix`/lib -PREFIX_WX_LIBS = lib`wx-config --basename` +PREFIX_WX_LIBS = `wx-config --basename` SUFFIX_WX_LIBSTD = `wx-config --utility=` -SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a +SUFFIX_WX_LIBGL = _gl-$(LIBVERSION) # Use static link for libstdc++.a (sometimes also libsupc++.a) # locate libstdc++.a and copy it in kicad_dev/syslibs @@ -51,13 +51,10 @@ # attention à l'ordre des libairies LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ $(EXTRALIBS) $(WXSYSLIB)\ - $(WXPATH)/libwxpng-$(LIBVERSION).a\ - $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ - $(WXPATH)/libwxzlib-$(LIBVERSION).a\ $(LIBSTDC) ifdef KICAD_STATIC_LINK -LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a +LIBS3D = $(WXPATH)/lib$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL).a $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a else -LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU +LIBS3D = -l$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL) -lGL -lGLU endif