songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- remove $(CUSTOM_LDFLAGS) from src/Core/makefile 

- -add $(CGAL_LIBPATHFLAGS) to src/CGALQt/makefile
This commit is contained in:
Laurent Rineau 2007-02-23 00:17:01 +00:00
parent 8862a968af
commit de6e7b227f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/Core/makefile
View File

@ -41,8 +41,9 @@ SOMAJOR=2
LIB_NAME_BASE = core++
ADDITIONAL_CXXFLAGS = $(ALL_GMP_CXXFLAGS) $(ALL_MPFR_CXXFLAGS)
SHARED_LIB_ADDITIONAL_LDFLAGS = $(GMP_LIBPATHFLAGS) $(GMP_LDFLAGS) \
$(MPFR_LIBPATHFLAGS) $(MPFR_LDFLAGS) $(CUSTOM_LDFLAGS)
SHARED_LIB_ADDITIONAL_LDFLAGS = \
$(GMP_LIBPATHFLAGS) $(GMP_LDFLAGS) \
$(MPFR_LIBPATHFLAGS) $(MPFR_LDFLAGS)
# The shared_lib case is still buggy:
# - When GMP or MPFR is a static library on Darwin, it fails because -fno-common is required...

2
Qt_widget/src/CGALQt/makefile
View File

@ -58,7 +58,7 @@ SHARED_LIB_ADDITIONAL_LDFLAGS = \
$(QT_LIBPATHFLAGS) $(QT_LDFLAGS) \
$(OPENGL_LIBPATHFLAGS) $(OPENGL_LDFLAGS) \
$(X11_LIBPATHFLAGS) $(X11_LDFLAFS) \
$(CGAL_CGAL_LDFLAGS)
$(CGAL_LIBPATHFLAGS) $(CGAL_CGAL_LDFLAGS)
#---------------------------------------------------------------------#
# common rules for all libraries