diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:20:34 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:20:34 +0000 |
| commit | 6003c989ad7c5c183cc3f8dc67ae982f3a826be5 (patch) | |
| tree | f07a2827f309c36964418c37ee3f2091559f546e /canvas/source/directx/makefile.mk | |
| parent | 923c06e7e9068549343c19ad3a33e7bf7a8a5f00 (diff) | |
INTEGRATION: CWS obo21 (1.3.6); FILE MERGED
2007/12/06 10:22:04 obo 1.3.6.1: #i84233# change for .Net 2008 (no directx 5 available)
Diffstat (limited to 'canvas/source/directx/makefile.mk')
| -rw-r--r-- | canvas/source/directx/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/canvas/source/directx/makefile.mk b/canvas/source/directx/makefile.mk index 81427e03c7cf..d7b0905c0d91 100644 --- a/canvas/source/directx/makefile.mk +++ b/canvas/source/directx/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2008-01-04 16:14:35 $ +# last change: $Author: ihi $ $Date: 2008-01-15 13:20:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -62,7 +62,11 @@ CDEFS+= -DVERBOSE CDEFS+= -DDX_DEBUG_IMAGES .ENDIF +.IF "$(CCNUMVER)" <= "001499999999" CDEFS += -DDIRECTX_VERSION=0x0500 +.ELSE +CDEFS += -DDIRECTX_VERSION=0x0900 +.ENDIF # --- This is Windows only! { ---------------------------------------------------------------- @@ -90,6 +94,7 @@ SLOFILES = \ $(SLO)$/dx_vcltools.obj \ $(SLO)$/dx_textlayout_drawhelper.obj \ +.IF "$(CCNUMVER)" <= "001499999999" ######################################################## # DX5 ######################################################## @@ -136,7 +141,7 @@ SHL1STDLIBS += dxguid.lib # directx 9 .IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!="" SHL1STDLIBS += imdebug.lib .ENDIF - +.ENDIF ######################################################## # DX9 ######################################################## @@ -187,3 +192,4 @@ SHL1STDLIBS += imdebug.lib # ========================================================================== .INCLUDE : target.mk + |