diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-03-04 14:36:08 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-04-21 18:18:44 +0200 |
| commit | de030cd7a234fd9191364647deb1a4836ca992cb (patch) | |
| tree | 8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /odk | |
| parent | 489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff) | |
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CppunitTest_odk_checkapi.mk | 1 | ||||
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 4 | ||||
| -rw-r--r-- | odk/Package_odk_headers.mk | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk index d671752a5607..0acc081048da 100644 --- a/odk/CppunitTest_odk_checkapi.mk +++ b/odk/CppunitTest_odk_checkapi.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\ cppuhelper \ sal \ salhelper \ - $(gb_UWINAPI) \ )) $(eval $(call gb_CppunitTest_set_external_code,odk_checkapi)) diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 3311af2e5ec6..2f67cc6f1897 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -9,8 +9,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/docs)) -odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \ - $(if $(filter WNT,$(OS)),systools) +odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper + odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ com/sun/star/uno/Any.hxx \ com/sun/star/uno/genfunc.h \ diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk index 4b7590d1d66c..40e0fb83d0f8 100644 --- a/odk/Package_odk_headers.mk +++ b/odk/Package_odk_headers.mk @@ -167,7 +167,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\ salhelper/singletonref.hxx \ salhelper/thread.hxx \ salhelper/timer.hxx \ - systools/win32/snprintf.h \ typelib/typeclass.h \ typelib/typedescription.h \ typelib/typedescription.hxx \ |