hrev46840 adds 1 changeset to branch 'master' old head: a5eb84617cc1742c4ad2f27a1c3ccf9d6b12fb57 new head: d02b8b81e884bd0090ef9bd2d7a62af673eca354 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d02b8b8+%5Ea5eb846 ---------------------------------------------------------------------------- d02b8b8: app_server: Cleanup of some file locations [ Stephan Aßmus <superstippi@xxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev46840 Commit: d02b8b81e884bd0090ef9bd2d7a62af673eca354 URL: http://cgit.haiku-os.org/haiku/commit/?id=d02b8b8 Author: Stephan Aßmus <superstippi@xxxxxx> Date: Sat Feb 8 10:50:42 2014 UTC ---------------------------------------------------------------------------- 9 files changed, 4 insertions(+), 4 deletions(-) src/servers/app/Jamfile | 4 +--- src/servers/app/{ => drawing}/AlphaMask.cpp | 0 src/servers/app/{ => drawing}/AlphaMask.h | 0 src/servers/app/{ => drawing}/BitmapDrawingEngine.cpp | 0 src/servers/app/{ => drawing}/BitmapDrawingEngine.h | 0 src/servers/app/drawing/Jamfile | 4 +++- src/servers/app/{ => drawing/Painter}/agg_clipped_alpha_mask.h | 0 .../app/{ => drawing/Painter}/agg_scanline_storage_subpix.h | 0 src/servers/app/{ => drawing/Painter}/agg_scanline_u_subpix.h | 0 ---------------------------------------------------------------------------- diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile index 4a4e300..43687fe 100644 --- a/src/servers/app/Jamfile +++ b/src/servers/app/Jamfile @@ -31,7 +31,7 @@ local font_src = ; UseBuildFeatureHeaders freetype ; -Includes [ FGristFiles AlphaMask.cpp AppServer.cpp BitmapManager.cpp +Includes [ FGristFiles AppServer.cpp BitmapManager.cpp ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp DrawState.cpp DrawingContext.cpp ServerApp.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp ServerPicture.cpp ServerWindow.cpp @@ -46,11 +46,9 @@ if $(TARGET_ARCH) != x86_64 { } Server app_server : - AlphaMask.cpp Angle.cpp AppServer.cpp #BitfieldRegion.cpp - BitmapDrawingEngine.cpp BitmapManager.cpp ClientMemoryAllocator.cpp CursorData.cpp diff --git a/src/servers/app/AlphaMask.cpp b/src/servers/app/drawing/AlphaMask.cpp similarity index 100% rename from src/servers/app/AlphaMask.cpp rename to src/servers/app/drawing/AlphaMask.cpp diff --git a/src/servers/app/AlphaMask.h b/src/servers/app/drawing/AlphaMask.h similarity index 100% rename from src/servers/app/AlphaMask.h rename to src/servers/app/drawing/AlphaMask.h diff --git a/src/servers/app/BitmapDrawingEngine.cpp b/src/servers/app/drawing/BitmapDrawingEngine.cpp similarity index 100% rename from src/servers/app/BitmapDrawingEngine.cpp rename to src/servers/app/drawing/BitmapDrawingEngine.cpp diff --git a/src/servers/app/BitmapDrawingEngine.h b/src/servers/app/drawing/BitmapDrawingEngine.h similarity index 100% rename from src/servers/app/BitmapDrawingEngine.h rename to src/servers/app/drawing/BitmapDrawingEngine.h diff --git a/src/servers/app/drawing/Jamfile b/src/servers/app/drawing/Jamfile index e35f187..0893dfb 100644 --- a/src/servers/app/drawing/Jamfile +++ b/src/servers/app/drawing/Jamfile @@ -12,11 +12,13 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ; UseBuildFeatureHeaders freetype ; -Includes [ FGristFiles DrawingEngine.cpp ] +Includes [ FGristFiles AlphaMask.cpp DrawingEngine.cpp ] : [ BuildFeatureAttribute freetype : headers ] ; StaticLibrary libasdrawing.a : + AlphaMask.cpp BitmapBuffer.cpp + BitmapDrawingEngine.cpp drawing_support.cpp DrawingEngine.cpp MallocBuffer.cpp diff --git a/src/servers/app/agg_clipped_alpha_mask.h b/src/servers/app/drawing/Painter/agg_clipped_alpha_mask.h similarity index 100% rename from src/servers/app/agg_clipped_alpha_mask.h rename to src/servers/app/drawing/Painter/agg_clipped_alpha_mask.h diff --git a/src/servers/app/agg_scanline_storage_subpix.h b/src/servers/app/drawing/Painter/agg_scanline_storage_subpix.h similarity index 100% rename from src/servers/app/agg_scanline_storage_subpix.h rename to src/servers/app/drawing/Painter/agg_scanline_storage_subpix.h diff --git a/src/servers/app/agg_scanline_u_subpix.h b/src/servers/app/drawing/Painter/agg_scanline_u_subpix.h similarity index 100% rename from src/servers/app/agg_scanline_u_subpix.h rename to src/servers/app/drawing/Painter/agg_scanline_u_subpix.h