mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix canvas build with Win8 SDK

Browse Source 
Change-Id: I17bd44ba8f5a6484d10bb64201ace8e030cf334d
Reviewed-on: https://gerrit.libreoffice.org/789
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Peter Foley 2012-08-24 15:52:09 -04:00 committed by Norbert Thiebaud
parent bac631c43d
commit ffbcd1c8b4
6 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
canvas/Library_directx9canvas.mk
View File

@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifeq ($(WINDOWS_SDK_VERSION),80)
$(eval $(call gb_Library_add_defs,directx9canvas,\
-DWIN8_SDK=1 \
))
endif
$(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_use_libraries,directx9canvas,\
cppu \ cppu \
tk \ tk \

6
canvas/Library_gdipluscanvas.mk
View File

@ -43,6 +43,12 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifeq ($(WINDOWS_SDK_VERSION),80)
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DWIN8_SDK=1 \
))
endif
ifneq ($(strip $(VERBOSE)$(verbose)),) ifneq ($(strip $(VERBOSE)$(verbose)),)
$(eval $(call gb_Library_add_defs,gdipluscanvas,\ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DVERBOSE \ -DVERBOSE \

6
canvas/StaticLibrary_directxcanvas.mk
View File

@ -43,6 +43,12 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifeq ($(WINDOWS_SDK_VERSION),80)
$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-DWIN8_SDK=1 \
))
endif
$(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\ $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
canvas/source/directx/dx_bitmap \ canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \ canvas/source/directx/dx_bitmapcanvashelper \

6
canvas/source/directx/dx_winstuff.hxx
View File

@ -81,6 +81,12 @@
typedef IDirectDrawSurface surface_type; typedef IDirectDrawSurface surface_type;
#elif WIN8_SDK == 1 //Windows 8 SDK
#include <d3d9.h>
typedef IDirect3DSurface9 surface_type;
#else #else
#include <dxsdkver.h> #include <dxsdkver.h>

1
config_host.mk.in
View File

@ -628,6 +628,7 @@ export VISIO_LIBS=@VISIO_LIBS@
export VISIO_TARBALL=@VISIO_TARBALL@ export VISIO_TARBALL=@VISIO_TARBALL@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
export WINDRES=@WINDRES@ export WINDRES=@WINDRES@
export WINEGCC=@WINEGCC@ export WINEGCC=@WINEGCC@
export WITHOUT_AFMS=@WITHOUT_AFMS@ export WITHOUT_AFMS=@WITHOUT_AFMS@

5
configure.in
View File

@ -9057,12 +9057,16 @@ the Windows SDK are installed.])
if test -z "$WINDOWS_SDK_HOME"; then if test -z "$WINDOWS_SDK_HOME"; then
AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway]) AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=61
AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)]) AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)])
elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=60
AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)]) AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)])
elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=70
AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)]) AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=80
AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)]) AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)])
else else
AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)]) AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
@ -9077,6 +9081,7 @@ the Windows SDK are installed.])
fi fi
fi fi
AC_SUBST(WINDOWS_SDK_HOME) AC_SUBST(WINDOWS_SDK_HOME)
AC_SUBST(WINDOWS_SDK_VERSION)
dnl ========================================= dnl =========================================
dnl Check for uuidgen dnl Check for uuidgen