Author: arist
Date: Wed Nov 14 22:56:01 2012
New Revision: 1409511
URL: http://svn.apache.org/viewvc?rev=1409511&view=rev
Log:
gnumake4_023_280f52b66154.patch
# HG changeset patch
# User mba
# Date 1298926438 -3600
# Node ID 280f52b66154128dce219e3149a356fb7e1dff0a
# Parent 56e4316f8d74544dc8ec0f2a1d86120a8a8af2b4
CWS gnumake4: build directx a second time for dx5
Modified:
incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
Modified: incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk?rev=1409511&r1=1409510&r2=1409511&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
(original)
+++ incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk Wed Nov
14 22:56:01 2012
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,dir
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
+ -I$(SRCDIR)/canvas/source/directx \
))
$(eval $(call gb_Library_set_defs,directx5canvas,\
@@ -86,29 +87,33 @@ $(eval $(call gb_Library_add_linked_libs
endif
endif
-$(eval $(call gb_Library_add_exception_objects,directx5canvas,\
- canvas/source/directx/dx_5rm \
- canvas/source/directx/dx_bitmap \
- canvas/source/directx/dx_bitmapcanvashelper \
- canvas/source/directx/dx_canvasbitmap \
- canvas/source/directx/dx_canvascustomsprite \
- canvas/source/directx/dx_canvasfont \
- canvas/source/directx/dx_canvashelper \
- canvas/source/directx/dx_canvashelper_texturefill \
- canvas/source/directx/dx_config \
- canvas/source/directx/dx_devicehelper \
- canvas/source/directx/dx_gdiplususer \
- canvas/source/directx/dx_impltools \
- canvas/source/directx/dx_linepolypolygon \
- canvas/source/directx/dx_spritecanvas \
- canvas/source/directx/dx_spritecanvashelper \
- canvas/source/directx/dx_spritedevicehelper \
- canvas/source/directx/dx_spritehelper \
- canvas/source/directx/dx_surfacebitmap \
- canvas/source/directx/dx_surfacegraphics \
- canvas/source/directx/dx_textlayout \
- canvas/source/directx/dx_textlayout_drawhelper \
- canvas/source/directx/dx_vcltools \
+$(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx :
$(SRCDIR)/canvas/source/directx/%.cxx
+ mkdir -p $(dir $@) && \
+ cp $< $@
+
+$(eval $(call gb_Library_add_generated_exception_objects,directx5canvas,\
+ CustomTarget/canvas/source/directx/dx_5rm \
+ CustomTarget/canvas/source/directx/dx_bitmap \
+ CustomTarget/canvas/source/directx/dx_bitmapcanvashelper \
+ CustomTarget/canvas/source/directx/dx_canvasbitmap \
+ CustomTarget/canvas/source/directx/dx_canvascustomsprite \
+ CustomTarget/canvas/source/directx/dx_canvasfont \
+ CustomTarget/canvas/source/directx/dx_canvashelper \
+ CustomTarget/canvas/source/directx/dx_canvashelper_texturefill \
+ CustomTarget/canvas/source/directx/dx_config \
+ CustomTarget/canvas/source/directx/dx_devicehelper \
+ CustomTarget/canvas/source/directx/dx_gdiplususer \
+ CustomTarget/canvas/source/directx/dx_impltools \
+ CustomTarget/canvas/source/directx/dx_linepolypolygon \
+ CustomTarget/canvas/source/directx/dx_spritecanvas \
+ CustomTarget/canvas/source/directx/dx_spritecanvashelper \
+ CustomTarget/canvas/source/directx/dx_spritedevicehelper \
+ CustomTarget/canvas/source/directx/dx_spritehelper \
+ CustomTarget/canvas/source/directx/dx_surfacebitmap \
+ CustomTarget/canvas/source/directx/dx_surfacegraphics \
+ CustomTarget/canvas/source/directx/dx_textlayout \
+ CustomTarget/canvas/source/directx/dx_textlayout_drawhelper \
+ CustomTarget/canvas/source/directx/dx_vcltools \
))
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk?rev=1409511&r1=1409510&r2=1409511&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk (original)
+++ incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk Wed Nov 14
22:56:01 2012
@@ -39,12 +39,11 @@ $(eval $(call gb_Module_add_targets,canv
ifeq ($(strip $(OS)),WNT)
ifneq ($(strip $(ENABLE_DIRECTX)),)
-# currently not supported
-#ifneq ($(strip $(USE_DIRECTX5)),)
-#$(eval $(call gb_Module_add_targets,canvas,\
-# Library_directx5canvas \
-#))
-#endif
+ifneq ($(strip $(USE_DIRECTX5)),)
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_directx5canvas \
+))
+endif
$(eval $(call gb_Module_add_targets,canvas,\
Library_directx9canvas \
