Kaydet (Commit) de030cd7 authored tarafından David Ostrovsky's avatar David Ostrovsky

gbuild: Remove MSVC 2013 legacy code

Uwinapi is discontinued.

Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
Tested-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
üst 489414f2
......@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
sal \
salhelper \
xmlreader \
$(gb_UWINAPI) \
))
ifeq ($(OS),WNT)
......
......@@ -550,9 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
log_uno_uno \
unsafe_uno_uno \
$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
$(if $(filter $(OS),WNT), \
uwinapi \
) \
))
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
......
......@@ -3036,7 +3036,7 @@ endif
ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)$(if $(filter INTEL,$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
$(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(if $(filter X86_64,$(CPUNAME)),amd64,win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
)
else ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\
......
......@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,ctl,\
cppuhelper \
sal \
tl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))
......
......@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,acc,\
tl \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,acc,\
......
......@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,animcore,\
......
......@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
tl \
utl \
vcl \
$(gb_UWINAPI) \
))
ifeq ($(ENABLE_GLTF),TRUE)
......
......@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaMacAVF,\
sal \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaMacAVF,\
......
......@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
sal \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\
......
......@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst,\
salhelper \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,avmediagst,\
......
......@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
salhelper \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_libs,avmediagst_0_10,\
......
......@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediaogl,\
salhelper \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_include,avmediaogl,\
......
......@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,avmediavlc,\
vcl \
utl \
salhelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,avmediavlc,\
......
......@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_libraries,avmediawin,\
tl \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_win32_libs,avmediawin,\
......
......@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basctl_dialogs_test, \
utl \
vcl \
xo \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_external,basctl_dialogs_test,boost_headers))
......
......@@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,basctl,\
ucbhelper \
vcl \
xmlscript \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,basctl,\
......
......@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
......
......@@ -19,7 +19,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_include,basegfx,\
......
......@@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
utl \
vcl \
xmlscript \
$(gb_UWINAPI) \
))
ifeq ($(OS),WNT)
......
......@@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
utl \
vcl \
xmlscript \
$(gb_UWINAPI) \
))
ifeq ($(OS),WNT)
......
......@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sb,\
utl \
vcl \
xmlscript \
$(gb_UWINAPI) \
))
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
......
......@@ -27,8 +27,4 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
))
endif
$(eval $(call gb_Library_use_libraries,officebean,\
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -92,17 +92,6 @@ public class LocalOfficeConnection
System.err.println( "cannot find msvcr71" );
}
try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "uwinapi");
}
catch (Throwable e)
{
// loading twice would fail
System.err.println("cannot find uwinapi:");
e.printStackTrace();
}
try
{
NativeLibraryLoader.loadLibrary(LocalOfficeConnection.class.getClassLoader(), "jawt");
......
......@@ -13,7 +13,6 @@ $(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\
......
......@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
cppuhelper \
sal \
salhelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\
......
......@@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,binaryurp,\
cppuhelper \
sal \
salhelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,binaryurp,\
......
......@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_libraries,java_uno,\
jvmaccess \
sal \
salhelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,java_uno,\
......
......@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,cairocanvas,\
tl \
i18nlangtag \
canvastools \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
......
......@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,canvasfactory,\
sal \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,canvasfactory,\
......
......@@ -36,7 +36,6 @@ $(eval $(call gb_Library_use_libraries,canvastools,\
tk \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,canvastools,\
......
......@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,directx9canvas,\
tl \
utl \
i18nlangtag \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_win32_libs,directx9canvas,\
......
......@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,gdipluscanvas,\
tl \
utl \
i18nlangtag \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_win32_libs,gdipluscanvas,\
......
......@@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_libraries,oglcanvas,\
tl \
i18nlangtag \
canvastools \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,oglcanvas,\
......
......@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,simplecanvas,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,simplecanvas,\
......
......@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,vclcanvas,\
tk \
tl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
......
......@@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_common_functors, \
cppuhelper \
sal \
salhelper \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_common_functors,\
......
......@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \
utl \
vcl \
xo \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers))
......
......@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_dump, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_dump,\
......
......@@ -56,7 +56,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_export,\
......
......@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_import,\
......
......@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_pivot_chart_test, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_pivot_chart_test,\
......
......@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_trendcalculators, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_trendcalculators,\
......
......@@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
vbahelper \
xo \
sw \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_set_include,chart2_xshape,\
......
......@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
ucbhelper \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
......
......@@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
ucbhelper \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
......
......@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
ucbhelper \
utl \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,chartopengl,\
......
......@@ -32,7 +32,6 @@ $(eval $(call gb_Executable_use_libraries,climaker,\
sal \
salhelper \
unoidl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Executable_use_system_win32_libs,climaker,\
......
......@@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_ifcontainer,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \
cppuhelper \
cppu \
sal \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
cppuhelper \
cppu \
sal \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_threadpool_test, \
cppuhelper \
cppu \
sal \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_variadictemplates_test, \
cppuhelper \
cppu \
sal \
$(gb_UWINAPI) \
))
# vim: set noet sw=4 ts=4:
......@@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_libraries,comphelper,\
salhelper \
ucbhelper \
i18nlangtag \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_sdk_api,comphelper))
......
......@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \
unotest \
xmlreader \
i18nlangtag \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_ure,configmgr_unit))
......
......@@ -62,7 +62,6 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
salhelper \
xmlreader \
i18nlangtag \
$(gb_UWINAPI) \
))