diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:25:27 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:26:03 +0200 |
| commit | bb5bdbbdca966c03e6b22b455630381154cb6d01 (patch) | |
| tree | e742242194c16bb1f2572a7bdbd6b81424654367 /dtrans | |
| parent | 10890bcd4205c82cf79170a61ca5efbb277f8c09 (diff) | |
Revert "Trying to chop out the uwinapi library"
This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/Library_dnd.mk | 1 | ||||
| -rw-r--r-- | dtrans/Library_ftransl.mk | 1 | ||||
| -rw-r--r-- | dtrans/Library_mcnttype.mk | 6 | ||||
| -rw-r--r-- | dtrans/Library_sysdtrans.mk | 1 | ||||
| -rw-r--r-- | dtrans/source/win32/workbench/makefile.mk | 1 | ||||
| -rw-r--r-- | dtrans/test/win32/dnd/makefile.mk | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 8a4727cf3540..09e71e85349c 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\ shell32 \ user32 \ uuid \ + uwinapi \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index d713d1c925a7..ee1308f9b8f7 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\ gdi32 \ ole32 \ sal \ + uwinapi \ $(gb_STDLIBS) \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 5826386cd5ec..7f020f2bdd7e 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -55,4 +55,10 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\ dtrans/source/cnttype/mctfentry \ )) +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,mcnttype,\ + uwinapi \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 31e6a2ce8998..de1843beb7c2 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\ shell32 \ uuid \ user32 \ + uwinapi \ $(gb_STDLIBS) \ )) diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk index dc75d3071fea..7432d2512df2 100644 --- a/dtrans/source/win32/workbench/makefile.mk +++ b/dtrans/source/win32/workbench/makefile.mk @@ -57,6 +57,7 @@ APP1OBJS= $(OBJ)$/test_wincb.obj APP1STDLIBS= $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ + $(SOLARLIBDIR)$/uwinapi.lib\ $(USER32LIB) \ $(OLE32LIB)\ $(COMDLG32LIB) diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk index ff0ad756f018..93ac89b0d35c 100644 --- a/dtrans/test/win32/dnd/makefile.mk +++ b/dtrans/test/win32/dnd/makefile.mk @@ -59,6 +59,7 @@ APP1STDLIBS= \ $(SALLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(UWINAPILIB) \ $(USER32LIB) \ $(OLE32LIB) \ comsupp.lib \ |