attempt at fixing LDFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,8 +10,8 @@
|
|||||||
|
|
||||||
####################### GENERAL SETTINGS ############################
|
####################### GENERAL SETTINGS ############################
|
||||||
|
|
||||||
|
# see comment near LDFLAGS at the end of file
|
||||||
EXTRALIBS = @EXTRA_LIBS@
|
EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
|
||||||
LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
|
LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
|
||||||
|
|
||||||
TOOLKIT = @TOOLKIT@
|
TOOLKIT = @TOOLKIT@
|
||||||
@@ -68,6 +68,9 @@ SHARED_LD = @SHARED_LD@
|
|||||||
CFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
|
CFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
|
||||||
CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
|
CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
|
||||||
PICFLAGS = @PIC_FLAG@
|
PICFLAGS = @PIC_FLAG@
|
||||||
LDFLAGS = @LDFLAGS@
|
|
||||||
|
|
||||||
|
# taking into account how SHARED_LD is defined, appending LDFLAGS to it
|
||||||
|
# doesn't work, so we put them in the end of the linker command line in
|
||||||
|
# EXTRALIBS instead (see above)
|
||||||
|
# LDFLAGS = @LDFLAGS@
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user