diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2007-01-27 14:47:28 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2007-01-27 14:47:28 +0000 |
| commit | 50b5f0964f0c1ec31d94b56ac6499c8f5489d4f9 (patch) | |
| tree | ad6637fee1f7bc06810fc88e1ece647612a619bc /cad/kicad/files/patch-libs.FreeBSD | |
| parent | - Remove a.out support (diff) | |
Upgrade to 2007-01-15.
Changelog at <http://iut-tice.ujf-grenoble.fr/cao/news.txt>.
Notes
Notes:
svn path=/head/; revision=183415
Diffstat (limited to 'cad/kicad/files/patch-libs.FreeBSD')
| -rw-r--r-- | cad/kicad/files/patch-libs.FreeBSD | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD index 6f6476890a09..8d935b6a79d4 100644 --- a/cad/kicad/files/patch-libs.FreeBSD +++ b/cad/kicad/files/patch-libs.FreeBSD @@ -1,5 +1,5 @@ ---- libs.FreeBSD.orig Mon Apr 24 20:33:28 2006 -+++ libs.FreeBSD Mon Apr 24 20:39:35 2006 +--- libs.FreeBSD.orig Sat Jan 27 00:07:38 2007 ++++ libs.FreeBSD Sat Jan 27 00:08:36 2007 @@ -1,6 +1,6 @@ #Configuration for build kicad @@ -8,8 +8,12 @@ SRCSUFF = .cpp -@@ -14,11 +14,16 @@ - # KICAD_STATIC_LINK = 1 +@@ -11,26 +11,31 @@ + # You must comment or uncomment this line for dynamic or static link + # dynamic link is less difficult than static link + # choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. +-KICAD_STATIC_LINK = 1 ++#KICAD_STATIC_LINK = 1 # path and version definition for wxWidgets and mesa libs -MESALIBSPATH = /usr/local/lib @@ -29,7 +33,12 @@ # Use static link for libstdc++.a (sometimes also libsupc++.a) # locate libstdc++.a and copy it in kicad_dev/syslibs -@@ -30,33 +35,33 @@ + ifdef KICAD_STATIC_LINK + #define path for a copy of libstdc++.a or/and libsupc++.a: +-LIBSTDC = ../syslibs/libstdc++.a ++LIBSTDC = /usr/lib/libstdc++.a + else + # Or Use static link for libsupc++ or libstdc++ (more easy!!) LIBSTDC = -lstdc++ endif @@ -38,10 +47,9 @@ # use link static for wxWidgets ifdef KICAD_STATIC_LINK - LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL)\ +@@ -38,11 +43,11 @@ $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a -- -+ + WXSYSLIB= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \ - $(WXPATH)/libwxpng-$(LIBVERSION).a\ - $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ @@ -56,11 +64,9 @@ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ - -lglib-2.0 -lpangoft2-1.0 \ - -L/usr/lib +@@ -51,12 +56,12 @@ + -- -+ WXSYSLIB_WITH_GL= $(WXPATH)/$(PREFIX_WX_LIBS)-$(LIBVERSION).a \ - $(WXPATH)/libwxpng-$(LIBVERSION).a\ - $(WXPATH)/libwxjpeg-$(LIBVERSION).a\ @@ -69,7 +75,7 @@ + -ljpeg\ + -lz\ $(LIBS3D)\ -- /usr/X11R6/lib/libXinerama.a \ +- /usr/X11R6/lib/libXinerama.a \ - /usr/X11R6/lib/libXxf86vm.a \ + ${X11BASE}/lib/libXinerama.a \ + ${X11BASE}/lib/libXxf86vm.a \ @@ -77,10 +83,10 @@ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -64,16 +69,16 @@ - -L/usr/lib + -L/usr/lib else #or use "standard command" for wxWidgets --WXSYSLIB= `wx-config --libs` +-WXSYSLIB= `wx-config --libs std` -WXSYSLIB_WITH_GL= `wx-config --libs std,gl` +WXSYSLIB= `${WX_CONFIG} --libs` +WXSYSLIB_WITH_GL= `${WX_CONFIG} --libs std,gl` |