diff options
-rw-r--r-- | svl/Library_fsstorage.mk | 15 | ||||
-rw-r--r-- | svl/Library_passwordcontainer.mk | 15 | ||||
-rw-r--r-- | svl/Library_svl.mk | 17 | ||||
-rw-r--r-- | svtools/Executable_bmp.mk | 15 | ||||
-rw-r--r-- | svtools/Executable_bmpsum.mk | 15 | ||||
-rw-r--r-- | svtools/Executable_g2g.mk | 15 | ||||
-rw-r--r-- | svtools/Library_hatchwindowfactory.mk | 15 | ||||
-rw-r--r-- | svtools/Library_productregistration.mk | 15 | ||||
-rw-r--r-- | svtools/Library_svt.mk | 20 | ||||
-rw-r--r-- | toolkit/Library_tk.mk | 13 | ||||
-rw-r--r-- | tools/Executable_mkunroll.mk | 15 | ||||
-rw-r--r-- | tools/Executable_rscdep.mk | 23 | ||||
-rw-r--r-- | tools/Executable_so_checksum.mk | 15 | ||||
-rw-r--r-- | tools/Executable_sspretty.mk | 15 | ||||
-rw-r--r-- | tools/Library_tl.mk | 20 |
15 files changed, 0 insertions, 243 deletions
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 93ca50a2d9f4..f109e0620d5e 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -67,20 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,fsstorage,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,fsstorage,\ kernel32 \ msvcrt \ @@ -89,5 +75,4 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index a0fbe88be93d..d0b35552e18a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -63,20 +63,6 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ kernel32 \ msvcrt \ @@ -85,5 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 5181983b8bc1..7faf5caa7f65 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -169,22 +169,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/svdde/ddewrap \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,svl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - advapi32 \ - kernel32 \ - gdi32 \ - msvcrt \ - shell32 \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,svl,\ advapi32 \ kernel32 \ @@ -194,7 +178,6 @@ $(eval $(call gb_Library_add_linked_libs,svl,\ user32 \ uwinapi \ )) -endif else $(eval $(call gb_Library_add_exception_objects,svl,\ svl/unx/source/svdde/ddedummy \ diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 67b21600e523..24019ced63d2 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -53,20 +53,6 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,bmp,\ kernel32 \ msvcrt \ @@ -75,7 +61,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,bmp,\ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index 6b2c0466f0ec..3d04c3b5a25a 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -49,20 +49,6 @@ $(eval $(call gb_Executable_add_exception_objects,bmpsum,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ kernel32 \ msvcrt \ @@ -71,7 +57,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index d6b96970eacc..99bde19e1055 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -50,20 +50,6 @@ $(eval $(call gb_Executable_add_exception_objects,g2g,\ svtools/bmpmaker/g2g \ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,g2g,\ kernel32 \ msvcrt \ @@ -72,7 +58,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,g2g,\ pthread \ diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 3e96d22588c8..150b71396284 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -64,20 +64,6 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ kernel32 \ msvcrt \ @@ -87,5 +73,4 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk index 5df44f631097..8b0c27d4469a 100644 --- a/svtools/Library_productregistration.mk +++ b/svtools/Library_productregistration.mk @@ -66,20 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\ endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,productregistration,\ kernel32 \ msvcrt \ @@ -88,5 +74,4 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index f30ad02c3cd7..545690bd0f12 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -300,25 +300,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,svt,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - oleaut32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,svt,\ advapi32 \ gdi32 \ @@ -332,5 +313,4 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index ab51c1e282bb..9d94c76314f1 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -166,23 +166,10 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,tk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,tk,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 5f9753a2a88f..6a88e48f232a 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -58,20 +58,6 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ kernel32 \ msvcrt \ @@ -80,7 +66,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 85551407d335..d6f2c25a1763 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -55,30 +55,8 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -ifeq ($(HAVE_GETOPT),YES) -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ - -DHAVE_GETOPT \ -)) -endif -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,rscdep,\ gnu_getopt \ -)) -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ kernel32 \ msvcrt \ oldnames \ @@ -86,7 +64,6 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 1c0faf30b015..071f0c5bb7b0 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -51,20 +51,6 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ kernel32 \ msvcrt \ @@ -73,7 +59,6 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk index 637acf2afd0e..0c83b7137eea 100644 --- a/tools/Executable_sspretty.mk +++ b/tools/Executable_sspretty.mk @@ -56,20 +56,6 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Executable_add_linked_libs,sspretty,\ kernel32 \ msvcrt \ @@ -78,7 +64,6 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\ uwinapi \ )) endif -endif ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,sspretty,\ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index fe91657e42f4..dde1f8f5dd92 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -160,25 +160,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/win/source/dll/toolsdll \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,tl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - mpr \ - msvcrt \ - ole32 \ - shell32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,tl,\ advapi32 \ kernel32 \ @@ -192,7 +173,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\ uwinapi \ )) endif -endif # tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g # -DOPTIMIZE # no -DTOOLS_DLLIMPLEMENTATION on toolsdll |