diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 16:43:38 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 17:09:34 +0200 |
| commit | 5ec155753b3930857e5bb597af8204a708ecfbaa (patch) | |
| tree | 2ee2a22601998e65c0a2c6717258426b85109d1e /vcl/Library_vcl.mk | |
| parent | d5a8293e6c08610398c0dfb153220d3d5ea83494 (diff) | |
join WNT conditionals in Library_vcl
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 53 |
1 files changed, 24 insertions, 29 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b07d5582bd8f..563668ca30ea 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -42,17 +42,13 @@ endif $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) $(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash)) -ifeq ($(OS)$(COM),WNTGCC) -WINEINCLUDE=-I$(OUTDIR)/inc/external/wine -endif - $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc/pch) \ -I$(SRCDIR)/solenv/inc \ -I$(OUTDIR)/inc \ - $(WINEINCLUDE) \ + $(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \ -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ )) @@ -226,7 +222,30 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + kernel32 \ + mpr \ + msimg32 \ + msvcrt \ + $(gb_Library_win32_OLDNAMES) \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ + winspool \ +)) + $(eval $(call gb_Library_add_nativeres,vcl,src)) +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,vcl,\ + /ENTRY:LibMain@12 \ +)) +endif endif ifeq ($(GUIBASE),cocoatouch) @@ -517,29 +536,5 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(OS),WNT) -ifeq ($(COM),MSC) -$(eval $(call gb_Library_add_ldflags,vcl,\ - /ENTRY:LibMain@12 \ -)) -endif -$(eval $(call gb_Library_add_linked_libs,vcl,\ - advapi32 \ - gdi32 \ - gdiplus \ - imm32 \ - kernel32 \ - mpr \ - msimg32 \ - msvcrt \ - $(gb_Library_win32_OLDNAMES) \ - ole32 \ - shell32 \ - user32 \ - uuid \ - uwinapi \ - winspool \ -)) -endif # vim: set noet sw=4 ts=4: |