summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2017-03-04 14:36:08 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2017-04-21 18:18:44 +0200
commitde030cd7a234fd9191364647deb1a4836ca992cb (patch)
tree8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /desktop
parent489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (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 'desktop')
-rw-r--r--desktop/CppunitTest_desktop_dialogs_test.mk1
-rw-r--r--desktop/CppunitTest_desktop_lib.mk1
-rw-r--r--desktop/Executable_quickstart.mk4
-rw-r--r--desktop/Executable_sbase.mk4
-rw-r--r--desktop/Executable_scalc.mk4
-rw-r--r--desktop/Executable_sdraw.mk4
-rw-r--r--desktop/Executable_simpress.mk4
-rw-r--r--desktop/Executable_smath.mk4
-rw-r--r--desktop/Executable_soffice.mk4
-rw-r--r--desktop/Executable_soffice_bin.mk1
-rw-r--r--desktop/Executable_sweb.mk4
-rw-r--r--desktop/Executable_swriter.mk4
-rw-r--r--desktop/Executable_unopkg_bin.mk1
-rw-r--r--desktop/Library_crashreport.mk1
-rw-r--r--desktop/Library_deployment.mk1
-rw-r--r--desktop/Library_deploymentgui.mk1
-rw-r--r--desktop/Library_deploymentmisc.mk1
-rw-r--r--desktop/Library_migrationoo2.mk1
-rw-r--r--desktop/Library_migrationoo3.mk1
-rw-r--r--desktop/Library_offacc.mk1
-rw-r--r--desktop/Library_sofficeapp.mk1
-rw-r--r--desktop/Library_spl.mk1
-rw-r--r--desktop/Library_unopkgapp.mk1
23 files changed, 0 insertions, 50 deletions
diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk
index d51f7c70089f..ce26857ab8ff 100644
--- a/desktop/CppunitTest_desktop_dialogs_test.mk
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_dialogs_test, \
utl \
vcl \
xo \
- $(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_external,desktop_dialogs_test,boost_headers))
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index bfcbf56294fb..7f7a7c77c88b 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
unotest \
utl \
vcl \
- $(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_externals,desktop_lib, \
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index a4b18c55a5db..02b31fef736c 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
shell32 \
))
-$(eval $(call gb_Executable_use_libraries,quickstart,\
- $(gb_UWINAPI) \
-))
-
ifeq ($(COM),GCC)
$(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 9d35f56554da..4dd6be02a9ee 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sbase,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,sbase,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,sbase,\
winlauncher \
))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 0a0084979a64..fc066770b945 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,scalc,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,scalc,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,scalc,\
winlauncher \
))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 17f65ec6b770..1b12bb0f2467 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sdraw,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,sdraw,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,sdraw,\
winlauncher \
))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index d486f5716aff..7376b7bd3883 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,simpress,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,simpress,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,simpress,\
winlauncher \
))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index 980cc544edcd..249f62223bfe 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,smath,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,smath,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,smath,\
winlauncher \
))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0a6a0ccc5a4a..d1847d7bf76a 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,soffice))
$(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
-$(eval $(call gb_Executable_use_libraries,soffice,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_system_win32_libs,soffice,\
advapi32 \
shell32 \
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index f18e9dcd1fd8..6db3c110cc1f 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_Executable_set_include,soffice_bin,\
$(eval $(call gb_Executable_use_libraries,soffice_bin,\
sal \
sofficeapp \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Executable_add_cobjects,soffice_bin,\
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 25efba659ec8..0bbc83877742 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,sweb,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,sweb,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,sweb,\
winlauncher \
))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index f7b522800177..6fbf9bd5057c 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_ldflags,swriter,\
/ENTRY:wWinMainCRTStartup \
))
-$(eval $(call gb_Executable_use_libraries,swriter,\
- $(gb_UWINAPI) \
-))
-
$(eval $(call gb_Executable_use_static_libraries,swriter,\
winlauncher \
))
diff --git a/desktop/Executable_unopkg_bin.mk b/desktop/Executable_unopkg_bin.mk
index 2ee1985e9742..27ebc5db1eca 100644
--- a/desktop/Executable_unopkg_bin.mk
+++ b/desktop/Executable_unopkg_bin.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Executable_use_libraries,unopkg_bin,\
sal \
tl \
unopkgapp \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Executable_add_cobjects,unopkg_bin,\
diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk
index d6d9b8b91cc5..e61e837d96d4 100644
--- a/desktop/Library_crashreport.mk
+++ b/desktop/Library_crashreport.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_libraries,crashreport,\
sal \
salhelper \
utl \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,crashreport,\
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index ac32cebc1734..dbc55a700e04 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,deployment,\
utl \
xmlscript \
i18nlangtag \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index cca6211b3a10..a16b567ea5d4 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
ucbhelper \
utl \
vcl \
- $(gb_UWINAPI) \
))
ifeq ($(OS),WNT)
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 632b7b67e993..b3754912f54c 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\
utl \
xmlscript \
i18nlangtag \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index e6ea8cf597d0..21f5c1db175d 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
sal \
tl \
utl \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index e1540ea15d51..73c38bb291f7 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
sal \
tl \
utl \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index 7ca5d2ce4586..e02946b76692 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_libraries,offacc,\
cppu \
cppuhelper \
sal \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 29185e08f707..64b8bb3841d4 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
ucbhelper \
utl \
vcl \
- $(gb_UWINAPI) \
))
ifeq ($(OS),MACOSX)
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index d2bb2a15fb38..89c8e53b9e8a 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_libraries,spl,\
ucbhelper \
utl \
vcl \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 8c41170773d5..b8978625c3f7 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,unopkgapp,\
utl \
vcl \
i18nlangtag \
- $(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,unopkgapp,\