Fix several cases of forgetting to include libstdc++ in the libs. This allows a successful build of Haiku on gcc4 Haiku, though it's presently unclear to me why this didn't prevent linking on any other platform (gcc2 haiku, and gcc2/4 cross compilers from FBSD had no issues here).
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29957 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -25,7 +25,7 @@ Addon SMTP :
|
|||||||
smtp.cpp
|
smtp.cpp
|
||||||
md5c.c ;
|
md5c.c ;
|
||||||
|
|
||||||
LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) ;
|
LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
|
||||||
|
|
||||||
if $(USE_SSL) {
|
if $(USE_SSL) {
|
||||||
LinkAgainst SMTP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
|
LinkAgainst SMTP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Addon avi_reader :
|
|||||||
avi_reader.cpp
|
avi_reader.cpp
|
||||||
:
|
:
|
||||||
libopendml.a
|
libopendml.a
|
||||||
be libmedia.so
|
be libmedia.so $(TARGET_LIBSTDC++)
|
||||||
;
|
;
|
||||||
|
|
||||||
SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;
|
SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ Translator JPEGTranslator :
|
|||||||
exif_parser.cpp
|
exif_parser.cpp
|
||||||
JPEGTranslator.cpp
|
JPEGTranslator.cpp
|
||||||
|
|
||||||
: be translation libjpeg.a
|
: be translation libjpeg.a $(TARGET_LIBSTDC++)
|
||||||
: true
|
: true
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ Application Icon-O-Matic :
|
|||||||
MainWindow.cpp
|
MainWindow.cpp
|
||||||
Util.cpp
|
Util.cpp
|
||||||
|
|
||||||
: be tracker translation libshared.a libagg.a libexpat.a
|
: be tracker translation libshared.a libagg.a libexpat.a $(TARGET_LIBSTDC++)
|
||||||
|
|
||||||
: Icon-O-Matic.rdef
|
: Icon-O-Matic.rdef
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -14,5 +14,5 @@ Application Installer :
|
|||||||
InstallerWindow.cpp
|
InstallerWindow.cpp
|
||||||
PackageViews.cpp
|
PackageViews.cpp
|
||||||
PartitionMenuItem.cpp
|
PartitionMenuItem.cpp
|
||||||
: be tracker translation
|
: be tracker translation $(TARGET_LIBSTDC++)
|
||||||
: Installer.rdef ;
|
: Installer.rdef ;
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ SharedLibrary libtracker.so :
|
|||||||
VolumeWindow.cpp
|
VolumeWindow.cpp
|
||||||
WidgetAttributeText.cpp
|
WidgetAttributeText.cpp
|
||||||
|
|
||||||
: be translation $(vector_icon_libs)
|
: be translation $(vector_icon_libs) $(TARGET_LIBSTDC++)
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Preference Appearance :
|
|||||||
#FontMenu.cpp
|
#FontMenu.cpp
|
||||||
#MenuView.cpp
|
#MenuView.cpp
|
||||||
|
|
||||||
: be
|
: be $(TARGET_LIBSTDC++)
|
||||||
: Appearance.rdef
|
: Appearance.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,6 @@ Preference Keymap :
|
|||||||
KeymapMessageFilter.cpp
|
KeymapMessageFilter.cpp
|
||||||
KeymapWindow.cpp
|
KeymapWindow.cpp
|
||||||
|
|
||||||
: be tracker
|
: be tracker $(TARGET_LIBSTDC++)
|
||||||
: Keymap.rdef
|
: Keymap.rdef
|
||||||
;
|
;
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ Server app_server :
|
|||||||
:
|
:
|
||||||
libtranslation.so libbe.so
|
libtranslation.so libbe.so
|
||||||
libasdrawing.a libpainter.a libagg.a libfreetype.so
|
libasdrawing.a libpainter.a libagg.a libfreetype.so
|
||||||
libtextencoding.so libshared.a
|
libtextencoding.so libshared.a $(TARGET_LIBSTDC++)
|
||||||
|
|
||||||
: app_server.rdef
|
: app_server.rdef
|
||||||
;
|
;
|
||||||
|
|||||||
Reference in New Issue
Block a user