mirror of
https://review.haiku-os.org/haiku
synced 2024-11-23 15:28:58 +01:00
Moved IconUtils.h to Interface Kit and therefor made it an "official" header. Since the class has no
virtual but only static methods, it is not so likely that binary compatibility issues may arrise from using it in new apps. Adjusted all the Jamfiles that included the private libicon headers. Note that it was never necessary to link against libicon.a, since it's part of libbe anyway. There was one instance where that was done. Hopefully it does not break the build, but I did this change a while ago, tested it and then the harddrive began failing. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40679 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
ed95053221
commit
4153964a10
@ -1,10 +1,9 @@
|
||||
SubDir HAIKU_TOP src add-ons screen_savers icons ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders screen_saver ;
|
||||
# For BuildScreenSaverDefaultSettingsView
|
||||
|
||||
ScreenSaver Icons :
|
||||
IconDisplay.cpp IconsSaver.cpp :
|
||||
be libscreensaver.so libicon.a $(TARGET_LIBSUPC++)
|
||||
IconDisplay.cpp IconsSaver.cpp :
|
||||
be libscreensaver.so $(TARGET_LIBSUPC++)
|
||||
;
|
||||
|
@ -1,7 +1,5 @@
|
||||
SubDir HAIKU_TOP src add-ons translators hvif ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
|
||||
|
||||
AddResources HVIFTranslator : HVIFTranslator.rdef ;
|
||||
@ -10,7 +8,7 @@ Translator HVIFTranslator :
|
||||
HVIFMain.cpp
|
||||
HVIFTranslator.cpp
|
||||
HVIFView.cpp
|
||||
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
|
||||
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
|
||||
$(HAIKU_LOCALE_LIBS)
|
||||
: true
|
||||
;
|
||||
|
@ -2,7 +2,6 @@ SubDir HAIKU_TOP src apps diskprobe ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders shared ;
|
||||
|
||||
Application DiskProbe :
|
||||
|
@ -1,8 +1,6 @@
|
||||
SubDir HAIKU_TOP src apps expander ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
Application Expander :
|
||||
Application Expander :
|
||||
ExpanderApp.cpp
|
||||
ExpanderWindow.cpp
|
||||
ExpanderThread.cpp
|
||||
|
@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps networkstatus ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders net shared ;
|
||||
UseLibraryHeaders agg icon ;
|
||||
UseLibraryHeaders agg ;
|
||||
|
||||
local icon_libs ;
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
|
@ -1,7 +1,5 @@
|
||||
SubDir HAIKU_TOP src apps pairs ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
Application Pairs :
|
||||
Pairs.cpp
|
||||
PairsWindow.cpp
|
||||
|
@ -3,7 +3,6 @@ SubDir HAIKU_TOP src apps soundrecorder ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders shared ;
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
Application SoundRecorder :
|
||||
DrawButton.cpp
|
||||
|
@ -11,7 +11,6 @@ UsePrivateSystemHeaders ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ;
|
||||
UseLibraryHeaders ncurses ;
|
||||
UseLibraryHeaders termcap ;
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ;
|
||||
|
||||
|
@ -2,7 +2,6 @@ SubDir HAIKU_TOP src bin desklink ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders app interface shared ;
|
||||
|
||||
BinCommand desklink :
|
||||
|
@ -24,7 +24,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
|
||||
SetSubDirSupportedPlatforms haiku libbe_test ;
|
||||
|
||||
UseLibraryHeaders agg icon ;
|
||||
UseLibraryHeaders agg ;
|
||||
UsePrivateHeaders app input print interface libbe shared support tracker ;
|
||||
|
||||
SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ;
|
||||
|
@ -3,8 +3,7 @@ SubDir HAIKU_TOP src kits locale ;
|
||||
AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
UsePrivateHeaders libbe locale shared ;
|
||||
UsePublicHeaders locale storage icon ;
|
||||
UseLibraryHeaders icon ;
|
||||
UsePublicHeaders locale storage ;
|
||||
|
||||
local sources =
|
||||
cat.cpp
|
||||
@ -75,5 +74,5 @@ DoCatalogs liblocale.so
|
||||
AboutWindow.cpp
|
||||
ColorControl.cpp
|
||||
StringForSize.cpp
|
||||
TextView.cpp
|
||||
TextView.cpp
|
||||
;
|
||||
|
@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits shared ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
UseLibraryHeaders agg icon ;
|
||||
UseLibraryHeaders agg ;
|
||||
UsePrivateHeaders shared libbe ;
|
||||
UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ;
|
||||
|
@ -2,8 +2,6 @@ SubDir HAIKU_TOP src kits storage ;
|
||||
|
||||
SetSubDirSupportedPlatforms haiku libbe_test ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
UsePrivateHeaders app libroot shared storage ;
|
||||
UsePrivateSystemHeaders ;
|
||||
|
||||
|
@ -5,8 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
UsePrivateHeaders interface mount shared storage support tracker ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ;
|
||||
|
||||
SubDirC++Flags
|
||||
|
@ -6,18 +6,17 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
SubDirC++Flags -fmultiple-symbol-spaces ;
|
||||
}
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders media shared ;
|
||||
|
||||
Preference Media :
|
||||
Media.cpp
|
||||
MediaAlert.cpp
|
||||
MediaAlert.cpp
|
||||
MediaIcons.cpp
|
||||
MediaListItem.cpp
|
||||
MediaViews.cpp
|
||||
MediaWindow.cpp
|
||||
: media be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
|
||||
: media.rdef
|
||||
: media.rdef
|
||||
;
|
||||
|
||||
DoCatalogs Media
|
||||
|
@ -3,7 +3,6 @@ SubDir HAIKU_TOP src preferences screen ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders [ FDirName graphics radeon ] ;
|
||||
UsePrivateHeaders interface ;
|
||||
|
||||
|
@ -3,7 +3,6 @@ SubDir HAIKU_TOP src servers bluetooth ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders shared bluetooth net kernel ;
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
AddResources bluetooth_server : server-bluetooth.rdef ;
|
||||
|
||||
@ -15,7 +14,7 @@ Server bluetooth_server
|
||||
HCIControllerAccessor.cpp
|
||||
HCITransportAccessor.cpp
|
||||
LocalDeviceHandler.cpp
|
||||
LocalDeviceImpl.cpp
|
||||
LocalDeviceImpl.cpp
|
||||
Output.cpp
|
||||
: be network libbluetooth.so
|
||||
$(TARGET_LIBSTDC++)
|
||||
|
@ -9,7 +9,6 @@ if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
|
||||
UsePrivateHeaders mail ;
|
||||
UsePrivateHeaders shared ;
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
|
||||
|
||||
|
@ -2,20 +2,19 @@ SubDir HAIKU_TOP src servers midi ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
UsePrivateHeaders midi shared storage ;
|
||||
|
||||
Server midi_server :
|
||||
MidiServerApp.cpp
|
||||
MidiServerApp.cpp
|
||||
DeviceWatcher.cpp
|
||||
PortDrivers.cpp
|
||||
|
||||
# storage
|
||||
NodeMonitorHandler.cpp
|
||||
|
||||
|
||||
: be midi2 libshared.a libicon.a $(TARGET_LIBSTDC++)
|
||||
: midi_server.rdef
|
||||
;
|
||||
|
||||
SEARCH on [ FGristFiles NodeMonitorHandler.cpp ]
|
||||
SEARCH on [ FGristFiles NodeMonitorHandler.cpp ]
|
||||
+= [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
|
||||
|
@ -1,7 +1,6 @@
|
||||
SubDir HAIKU_TOP src servers notification ;
|
||||
|
||||
UsePrivateHeaders notification ;
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
Server notification_server :
|
||||
AppGroupView.cpp
|
||||
|
@ -2,10 +2,8 @@ SubDir HAIKU_TOP src tests kits midi patchbay ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UseLibraryHeaders icon ;
|
||||
|
||||
SimpleTest PatchBay
|
||||
:
|
||||
:
|
||||
PatchApp.cpp
|
||||
PatchWin.cpp
|
||||
PatchView.cpp
|
||||
@ -13,7 +11,7 @@ SimpleTest PatchBay
|
||||
EndpointInfo.cpp
|
||||
MidiEventMeter.cpp
|
||||
TToolTip.cpp
|
||||
:
|
||||
:
|
||||
midi midi2 be libicon.a $(TARGET_LIBSTDC++)
|
||||
;
|
||||
|
||||
|
@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
|
||||
|
||||
UsePrivateHeaders net shared ;
|
||||
UseLibraryHeaders agg icon ;
|
||||
UseLibraryHeaders agg ;
|
||||
|
||||
|
||||
AddResources Interfaces :
|
||||
|
Loading…
Reference in New Issue
Block a user