Commit cf211a4c authored by raburton's avatar raburton

improve static linking check to allow dynamic linking to be specified on make...

improve static linking check to allow dynamic linking to be specified on make command, no need to hack libs.linux now to use dynamic linking, just use "make -f makefile.gtk KICAD_STATIC_LINK=0"
parent c5aaa4dc
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
include ../../libs.linux include ../../libs.linux
# Use static link for libsupc++ (locate libstdc++.a and copy it in kicad_dev/syslibs) # Use static link for libsupc++ (locate libstdc++.a and copy it in kicad_dev/syslibs)
ifdef KICAD_STATIC_LINK ifeq ($(KICAD_STATIC_LINK), 1)
#define path for a copy of libstdc++.a or/and libsupc++.a: #define path for a copy of libstdc++.a or/and libsupc++.a:
LIBSTDC = ../../syslibs/libstdc++.a LIBSTDC = ../../syslibs/libstdc++.a
else else
......
...@@ -11,9 +11,9 @@ FINAL = 1 ...@@ -11,9 +11,9 @@ FINAL = 1
#KICAD_PYTHON = 1 #KICAD_PYTHON = 1
# You must comment or uncomment this line for dynamic or static link # You must comment this line for dynamic link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=0")
# dynamic link is less difficult than static link # dynamic link is less difficult than static link choose it if you have problems (libs not found, or
# choose it if you have problems (libs not found, or unresolved references) ), or if kicad is running only on YOUR system. # unresolved references), or if kicad is running only on YOUR system.
ifndef KICAD_PYTHON ifndef KICAD_PYTHON
KICAD_STATIC_LINK = 1 KICAD_STATIC_LINK = 1
endif endif
...@@ -36,7 +36,7 @@ SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a ...@@ -36,7 +36,7 @@ SUFFIX_WX_LIBGL = _gl-$(LIBVERSION).a
# Use static link for libstdc++.a (sometimes also libsupc++.a) # Use static link for libstdc++.a (sometimes also libsupc++.a)
# locate libstdc++.a and copy it in kicad_dev/syslibs # locate libstdc++.a and copy it in kicad_dev/syslibs
ifdef KICAD_STATIC_LINK ifeq ($(KICAD_STATIC_LINK), 1)
#define path for a copy of libstdc++.a or/and libsupc++.a: #define path for a copy of libstdc++.a or/and libsupc++.a:
LIBSTDC = ../syslibs/libstdc++.a LIBSTDC = ../syslibs/libstdc++.a
else else
...@@ -49,7 +49,7 @@ LIBVERSION=`wx-config --release` ...@@ -49,7 +49,7 @@ LIBVERSION=`wx-config --release`
LIBREGEX=$(WXPATH)/libwxregexu-$(LIBVERSION).a LIBREGEX=$(WXPATH)/libwxregexu-$(LIBVERSION).a
# use link static for wxWidgets # use link static for wxWidgets
ifdef KICAD_STATIC_LINK ifeq ($(KICAD_STATIC_LINK), 1)
LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL)\ LIBS3D = $(WXPATH)/$(PREFIX_WX_LIBS)$(SUFFIX_WX_LIBGL)\
$(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a $(MESALIBSPATH)/libGL.a $(MESALIBSPATH)/libGLU.a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment